Merge pull request #3011 from Emantor/fix/2922

output: initialize layers before usage in apply_config

1 files changed, 6 insertions, 6 deletions

diff --git a/sway/tree/output.c b/sway/tree/output.c
index e5794b8a..632501e1 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -65,6 +65,12 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
                 return;
         }
         struct wlr_output *wlr_output = output->wlr_output;
+        size_t len = sizeof(output->layers) / sizeof(output->layers[0]);
+        for (size_t i = 0; i < len; ++i) {
+                wl_list_init(&output->layers[i]);
+        }
+        wl_signal_init(&output->events.destroy);
+
         output->enabled = true;
         apply_output_config(oc, output);
         list_add(root->outputs, output);
@@ -92,12 +98,6 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
                 ipc_event_workspace(NULL, ws, "init");
         }
 
-        size_t len = sizeof(output->layers) / sizeof(output->layers[0]);
-        for (size_t i = 0; i < len; ++i) {
-                wl_list_init(&output->layers[i]);
-        }
-        wl_signal_init(&output->events.destroy);
-
         input_manager_configure_xcursor();
 
         wl_signal_add(&wlr_output->events.mode, &output->mode);