diff options
author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-10-26 19:18:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-26 19:18:00 -0400 |
commit | b63669a2a04027a029e7332ca4e7670457f59fd2 (patch) | |
tree | d1b30ac2a954e6d2456ed038097b5f658c277fe6 | |
parent | Merge pull request #2989 from RyanDwyer/fix-focus-glitchiness (diff) | |
parent | Fix #2992 (diff) | |
download | sway-b63669a2a04027a029e7332ca4e7670457f59fd2.tar.gz sway-b63669a2a04027a029e7332ca4e7670457f59fd2.tar.zst sway-b63669a2a04027a029e7332ca4e7670457f59fd2.zip |
Merge pull request #2993 from mwenzkowski/fix-2992
Fix #2992
-rw-r--r-- | sway/tree/output.c | 3 |
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); |