diff options
| author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-11 11:03:43 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-06-11 11:03:43 +1000 |
| commit | 9e96cfd310c4e5dc60f07d772e60b139ff7dc448 (patch) | |
| tree | 9961c8705208b2f127133f0533bd305a6f75015e /sway/tree/output.c | |
| parent | bb66e6d578fdc68fb33d0fde921390d74f20bb31 (diff) | |
| parent | 867fb6aedbbe4cd1c7f4817848682609e8489880 (diff) | |
| download | sway-9e96cfd310c4e5dc60f07d772e60b139ff7dc448.tar.xz | |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'sway/tree/output.c')
| -rw-r--r-- | sway/tree/output.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c index ed7e941e..8af319d5 100644 --- a/sway/tree/output.c +++ b/sway/tree/output.c @@ -26,12 +26,10 @@ static void restore_workspaces(struct sway_container *output) { j--; } } - - arrange_output(other); } container_sort_workspaces(output); - arrange_output(output); + arrange_and_commit(&root_container); } struct sway_container *output_create( @@ -68,6 +66,7 @@ struct sway_container *output_create( struct sway_container *output = container_create(C_OUTPUT); output->sway_output = sway_output; + sway_output->swayc = output; output->name = strdup(name); if (output->name == NULL) { container_destroy(output); |