aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2019-10-26 14:00:37 +0200
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-10-27 10:51:02 -0400
commitec14a00e8c6751d0b73ca0ad5f756e4165092b87 (patch)
tree36a4a947b4fb9d89fec848a2e269304ded139621 /sway/config
parentFix apply_output_config return value when enabling output (diff)
downloadsway-ec14a00e8c6751d0b73ca0ad5f756e4165092b87.tar.gz
sway-ec14a00e8c6751d0b73ca0ad5f756e4165092b87.tar.zst
sway-ec14a00e8c6751d0b73ca0ad5f756e4165092b87.zip
Fix segfault in wlr_output_manager_v1_set_configuration
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
Diffstat (limited to 'sway/config')
-rw-r--r--sway/config/output.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sway/config/output.c b/sway/config/output.c
index 3c36692f..50bf1155 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -278,6 +278,7 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
278 sway_log(SWAY_ERROR, "Failed to modeset output %s", wlr_output->name); 278 sway_log(SWAY_ERROR, "Failed to modeset output %s", wlr_output->name);
279 return false; 279 return false;
280 } 280 }
281 output->current_mode = wlr_output->current_mode;
281 282
282 if (oc && oc->scale > 0) { 283 if (oc && oc->scale > 0) {
283 sway_log(SWAY_DEBUG, "Set %s scale to %f", oc->name, oc->scale); 284 sway_log(SWAY_DEBUG, "Set %s scale to %f", oc->name, oc->scale);