aboutsummaryrefslogtreecommitdiffstats
path: root/sway/tree/output.c
diff options
context:
space:
mode:
authorLibravatar mwenzkowski <29407878+mwenzkowski@users.noreply.github.com>2018-10-26 22:53:45 +0200
committerLibravatar mwenzkowski <29407878+mwenzkowski@users.noreply.github.com>2018-10-26 23:31:57 +0200
commit94985146ea00b40f72cd6afaa191fd92a46e4fd3 (patch)
treed1b30ac2a954e6d2456ed038097b5f658c277fe6 /sway/tree/output.c
parentMerge pull request #2989 from RyanDwyer/fix-focus-glitchiness (diff)
downloadsway-94985146ea00b40f72cd6afaa191fd92a46e4fd3.tar.gz
sway-94985146ea00b40f72cd6afaa191fd92a46e4fd3.tar.zst
sway-94985146ea00b40f72cd6afaa191fd92a46e4fd3.zip
Fix #2992
Move a function call, such that data it depends on is initialized before.
Diffstat (limited to 'sway/tree/output.c')
-rw-r--r--sway/tree/output.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c
index e5794b8a..9d523997 100644
--- a/sway/tree/output.c
+++ b/sway/tree/output.c
@@ -66,7 +66,6 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
66 } 66 }
67 struct wlr_output *wlr_output = output->wlr_output; 67 struct wlr_output *wlr_output = output->wlr_output;
68 output->enabled = true; 68 output->enabled = true;
69 apply_output_config(oc, output);
70 list_add(root->outputs, output); 69 list_add(root->outputs, output);
71 70
72 output->lx = wlr_output->lx; 71 output->lx = wlr_output->lx;
@@ -98,6 +97,8 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
98 } 97 }
99 wl_signal_init(&output->events.destroy); 98 wl_signal_init(&output->events.destroy);
100 99
100 apply_output_config(oc, output);
101
101 input_manager_configure_xcursor(); 102 input_manager_configure_xcursor();
102 103
103 wl_signal_add(&wlr_output->events.mode, &output->mode); 104 wl_signal_add(&wlr_output->events.mode, &output->mode);