mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-24 06:59:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix segfault in wlr_output_manager_v1_set_configuration

Browse source 
Calling wlr_output_manager_v1_set_configuration with an enabled output
and a NULL mode is incorrect if the output doesn't support modes.

When DPMS'ing an output, wlr_output_enable(output, false) is called.
This de-allocates the CRTC and sets wlr_output.current_mode to NULL.

Because we mark DPMS'ed outputs as enabled, we also need to provide a
correct output mode. Add a field to sway_output to hold the current
mode.

Closes: https://github.com/swaywm/wlroots/issues/1867
This commit is contained in:
Simon Ser 2019-10-26 14:00:37 +02:00 • committed by Drew DeVault
parent 58a40ce07b
commit ec14a00e8c
4 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sway/config/output.c
View file

@ -278,6 +278,7 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
sway_log(SWAY_ERROR, "Failed to modeset output %s", wlr_output->name);
return false;
}
output->current_mode = wlr_output->current_mode;
if (oc && oc->scale > 0) {
sway_log(SWAY_DEBUG, "Set %s scale to %f", oc->name, oc->scale);