diff options
Diffstat (limited to 'sway/tree/output.c')
-rw-r--r-- | sway/tree/output.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c index 242e6fac..8eefcee3 100644 --- a/sway/tree/output.c +++ b/sway/tree/output.c | |||
@@ -95,7 +95,7 @@ struct sway_output *output_create(struct wlr_output *wlr_output) { | |||
95 | output->detected_subpixel = wlr_output->subpixel; | 95 | output->detected_subpixel = wlr_output->subpixel; |
96 | output->scale_filter = SCALE_FILTER_NEAREST; | 96 | output->scale_filter = SCALE_FILTER_NEAREST; |
97 | 97 | ||
98 | wl_signal_init(&output->events.destroy); | 98 | wl_signal_init(&output->events.disable); |
99 | 99 | ||
100 | wl_list_insert(&root->all_outputs, &output->link); | 100 | wl_list_insert(&root->all_outputs, &output->link); |
101 | 101 | ||
@@ -262,7 +262,7 @@ void output_disable(struct sway_output *output) { | |||
262 | } | 262 | } |
263 | 263 | ||
264 | sway_log(SWAY_DEBUG, "Disabling output '%s'", output->wlr_output->name); | 264 | sway_log(SWAY_DEBUG, "Disabling output '%s'", output->wlr_output->name); |
265 | wl_signal_emit(&output->events.destroy, output); | 265 | wl_signal_emit(&output->events.disable, output); |
266 | 266 | ||
267 | output_evacuate(output); | 267 | output_evacuate(output); |
268 | 268 | ||
@@ -289,10 +289,6 @@ void output_begin_destroy(struct sway_output *output) { | |||
289 | 289 | ||
290 | output->node.destroying = true; | 290 | output->node.destroying = true; |
291 | node_set_dirty(&output->node); | 291 | node_set_dirty(&output->node); |
292 | |||
293 | wl_list_remove(&output->link); | ||
294 | output->wlr_output->data = NULL; | ||
295 | output->wlr_output = NULL; | ||
296 | } | 292 | } |
297 | 293 | ||
298 | struct sway_output *output_from_wlr_output(struct wlr_output *output) { | 294 | struct sway_output *output_from_wlr_output(struct wlr_output *output) { |