Merge remote-tracking branch 'upstream/master' into atomic

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);