aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config
diff options
context:
space:
mode:
authorLibravatar Yorick van Pelt <yorick@yorickvanpelt.nl>2020-02-13 12:54:48 +0100
committerLibravatar Simon Ser <contact@emersion.fr>2020-02-13 13:05:17 +0100
commit447967ad3a68b5a515581e4db76fb232cf56caa3 (patch)
treec232528b41409e04e3585aeb4efa6bccfff07eb1 /sway/config
parentcmd_swap: fix test_mark condition (diff)
downloadsway-447967ad3a68b5a515581e4db76fb232cf56caa3.tar.gz
sway-447967ad3a68b5a515581e4db76fb232cf56caa3.tar.zst
sway-447967ad3a68b5a515581e4db76fb232cf56caa3.zip
Fix crash: use wlr_output->name instead of possibly missing oc->name
Fixes segfault on start: https://gist.github.com/yorickvP/89eccb3782c6edb22aeda6ce9c6d4fcb
Diffstat (limited to 'sway/config')
-rw-r--r--sway/config/output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/config/output.c b/sway/config/output.c
index 26d40f3e..de566869 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -383,7 +383,7 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
383 sway_log(SWAY_DEBUG, "Auto-detected output scale: %f", scale); 383 sway_log(SWAY_DEBUG, "Auto-detected output scale: %f", scale);
384 } 384 }
385 if (scale != wlr_output->scale) { 385 if (scale != wlr_output->scale) {
386 sway_log(SWAY_DEBUG, "Set %s scale to %f", oc->name, scale); 386 sway_log(SWAY_DEBUG, "Set %s scale to %f", wlr_output->name, scale);
387 wlr_output_set_scale(wlr_output, scale); 387 wlr_output_set_scale(wlr_output, scale);
388 } 388 }
389 389