diff options
author | mwenzkowski <29407878+mwenzkowski@users.noreply.github.com> | 2018-10-26 22:53:45 +0200 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-11-01 08:15:03 -0400 |
commit | cd0bae80b6f1cc27ffff47618b4332449468134c (patch) | |
tree | 82138b6232e8da790df8242984aa4e87f475a5c9 /sway/tree/output.c | |
parent | Merge pull request #3041 from RyanDwyer/marks-props-to-container (diff) | |
download | sway-cd0bae80b6f1cc27ffff47618b4332449468134c.tar.gz sway-cd0bae80b6f1cc27ffff47618b4332449468134c.tar.zst sway-cd0bae80b6f1cc27ffff47618b4332449468134c.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.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c index b84053d9..2704920d 100644 --- a/sway/tree/output.c +++ b/sway/tree/output.c | |||
@@ -72,7 +72,6 @@ void output_enable(struct sway_output *output, struct output_config *oc) { | |||
72 | wl_signal_init(&output->events.destroy); | 72 | wl_signal_init(&output->events.destroy); |
73 | 73 | ||
74 | output->enabled = true; | 74 | output->enabled = true; |
75 | apply_output_config(oc, output); | ||
76 | list_add(root->outputs, output); | 75 | list_add(root->outputs, output); |
77 | 76 | ||
78 | output->lx = wlr_output->lx; | 77 | output->lx = wlr_output->lx; |
@@ -98,6 +97,9 @@ void output_enable(struct sway_output *output, struct output_config *oc) { | |||
98 | ipc_event_workspace(NULL, ws, "init"); | 97 | ipc_event_workspace(NULL, ws, "init"); |
99 | } | 98 | } |
100 | 99 | ||
100 | |||
101 | apply_output_config(oc, output); | ||
102 | |||
101 | input_manager_configure_xcursor(); | 103 | input_manager_configure_xcursor(); |
102 | 104 | ||
103 | wl_signal_add(&wlr_output->events.mode, &output->mode); | 105 | wl_signal_add(&wlr_output->events.mode, &output->mode); |