layer_shell: order destroying before sway_output

Both sway_output and sway_layer_shell listen to wlr's output destroy event,
but sway_layer_shell needs to access into sway_output's data strucure and needs
to be destroyed first.

Resolve this by making sway_layer_shell listen to a new event that happens at
start of sway_output's destroy handler

1 files changed, 3 insertions, 4 deletions

diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 94dc22e7..b57d1ee6 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -352,10 +352,6 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
         wl_signal_add(&layer_surface->surface->events.commit,
                 &sway_layer->surface_commit);
 
-        sway_layer->output_destroy.notify = handle_output_destroy;
-        wl_signal_add(&layer_surface->output->events.destroy,
-                &sway_layer->output_destroy);
-
         sway_layer->destroy.notify = handle_destroy;
         wl_signal_add(&layer_surface->events.destroy, &sway_layer->destroy);
         sway_layer->map.notify = handle_map;
@@ -368,6 +364,9 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
         layer_surface->data = sway_layer;
 
         struct sway_output *output = layer_surface->output->data;
+        sway_layer->output_destroy.notify = handle_output_destroy;
+        wl_signal_add(&output->events.destroy, &sway_layer->output_destroy);
+
         wl_list_insert(&output->layers[layer_surface->layer], &sway_layer->link);
 
         // Temporarily set the layer's current state to client_pending