1 files changed, 13 insertions, 16 deletions

diff --git a/sway/tree/output.c b/sway/tree/output.c
index a8ae30f7..ad8d2482 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -56,8 +56,8 @@ static void restore_workspaces(struct sway_output *output) {
         }
 
         // Saved workspaces
-        while (root->noop_output->workspaces->length) {
-                struct sway_workspace *ws = root->noop_output->workspaces->items[0];
+        while (root->fallback_output->workspaces->length) {
+                struct sway_workspace *ws = root->fallback_output->workspaces->items[0];
                 workspace_detach(ws);
                 output_add_workspace(output, ws);
 
@@ -70,13 +70,13 @@ static void restore_workspaces(struct sway_output *output) {
                 // floater re-centered
                 for (int i = 0; i < ws->floating->length; i++) {
                         struct sway_container *floater = ws->floating->items[i];
-                        if (floater->width == 0 || floater->height == 0 ||
-                                        floater->width > output->width ||
-                                        floater->height > output->height ||
-                                        floater->x > output->lx + output->width ||
-                                        floater->y > output->ly + output->height ||
-                                        floater->x + floater->width < output->lx ||
-                                        floater->y + floater->height < output->ly) {
+                        if (floater->pending.width == 0 || floater->pending.height == 0 ||
+                                        floater->pending.width > output->width ||
+                                        floater->pending.height > output->height ||
+                                        floater->pending.x > output->lx + output->width ||
+                                        floater->pending.y > output->ly + output->height ||
+                                        floater->pending.x + floater->pending.width < output->lx ||
+                                        floater->pending.y + floater->pending.height < output->ly) {
                                 container_floating_resize_and_center(floater);
                         }
                 }
@@ -95,7 +95,7 @@ struct sway_output *output_create(struct wlr_output *wlr_output) {
         output->detected_subpixel = wlr_output->subpixel;
         output->scale_filter = SCALE_FILTER_NEAREST;
 
-        wl_signal_init(&output->events.destroy);
+        wl_signal_init(&output->events.disable);
 
         wl_list_insert(&root->all_outputs, &output->link);
 
@@ -192,7 +192,7 @@ static void output_evacuate(struct sway_output *output) {
                         new_output = fallback_output;
                 }
                 if (!new_output) {
-                        new_output = root->noop_output;
+                        new_output = root->fallback_output;
                 }
 
                 struct sway_workspace *new_output_ws =
@@ -262,7 +262,7 @@ void output_disable(struct sway_output *output) {
         }
 
         sway_log(SWAY_DEBUG, "Disabling output '%s'", output->wlr_output->name);
-        wl_signal_emit(&output->events.destroy, output);
+        wl_signal_emit(&output->events.disable, output);
 
         output_evacuate(output);
 
@@ -286,13 +286,10 @@ void output_begin_destroy(struct sway_output *output) {
                 return;
         }
         sway_log(SWAY_DEBUG, "Destroying output '%s'", output->wlr_output->name);
+        wl_signal_emit(&output->node.events.destroy, &output->node);
 
         output->node.destroying = true;
         node_set_dirty(&output->node);
-
-        wl_list_remove(&output->link);
-        output->wlr_output->data = NULL;
-        output->wlr_output = NULL;
 }
 
 struct sway_output *output_from_wlr_output(struct wlr_output *output) {