Merge pull request #2993 from mwenzkowski/fix-2992

Fix #2992
This commit is contained in:
Brian Ashworth 2018-10-26 19:18:00 -04:00 committed by GitHub
commit b63669a2a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -66,7 +66,6 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
} }
struct wlr_output *wlr_output = output->wlr_output; struct wlr_output *wlr_output = output->wlr_output;
output->enabled = true; output->enabled = true;
apply_output_config(oc, output);
list_add(root->outputs, output); list_add(root->outputs, output);
output->lx = wlr_output->lx; output->lx = wlr_output->lx;
@ -98,6 +97,8 @@ void output_enable(struct sway_output *output, struct output_config *oc) {
} }
wl_signal_init(&output->events.destroy); wl_signal_init(&output->events.destroy);
apply_output_config(oc, output);
input_manager_configure_xcursor(); input_manager_configure_xcursor();
wl_signal_add(&wlr_output->events.mode, &output->mode); wl_signal_add(&wlr_output->events.mode, &output->mode);