mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-28 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not always modeset when applying output config

Browse source 
For most output config options, applying a config with the option unset
does not change the current value, but a modeset is always attempted
even if the output has no mode configured. This unexpectedly causes a
config reload to reset output modes, even if none are configured.

Change it to leave unconfigured outputs that already have a mode alone.

Fixes #4687
This commit is contained in:
Ronan Pigott 2019-11-04 23:35:10 -07:00
parent 3975ca28c2
commit 9636e3a551
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/config/output.c
View file

@ -269,7 +269,7 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
oc->height, oc->refresh_rate); oc->height, oc->refresh_rate);
modeset_success = set_mode(wlr_output, oc->width, oc->height, modeset_success = set_mode(wlr_output, oc->width, oc->height,
oc->refresh_rate, oc->custom_mode == 1); oc->refresh_rate, oc->custom_mode == 1);
} else if (!wl_list_empty(&wlr_output->modes)) { } else if (!wl_list_empty(&wlr_output->modes) && !wlr_output->current_mode) {
struct wlr_output_mode *mode = struct wlr_output_mode *mode =
wl_container_of(wlr_output->modes.prev, mode, link); wl_container_of(wlr_output->modes.prev, mode, link);
modeset_success = wlr_output_set_mode(wlr_output, mode); modeset_success = wlr_output_set_mode(wlr_output, mode);