diff options
| author |  Simon Ser <contact@emersion.fr> | 2019-10-26 13:59:19 +0200 |
|---|---|---|
| committer |  Drew DeVault <sir@cmpwn.com> | 2019-10-27 10:51:02 -0400 |
| commit | 58a40ce07b2e20e6fca70fba4c2775510928d33e (patch) | |
| tree | 5bb86b3f7bd50e1c1d0ef3984b16e8c66c6a9fe4 /sway/config | |
| parent | Fix tiled containers resize with mouse (diff) | |
| download | sway-58a40ce07b2e20e6fca70fba4c2775510928d33e.tar.gz sway-58a40ce07b2e20e6fca70fba4c2775510928d33e.tar.zst sway-58a40ce07b2e20e6fca70fba4c2775510928d33e.zip | |
Fix apply_output_config return value when enabling output
apply_output_config would call output_enable and always return true,
even if the output couldn't be enabled.
Diffstat (limited to 'sway/config')
| -rw-r--r-- | sway/config/output.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index 12a875b7..3c36692f 100644 --- a/sway/config/output.c +++ b/sway/config/output.c | |||
| @@ -249,8 +249,7 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) { | |||
| 249 | if (!oc || oc->dpms_state != DPMS_OFF) { | 249 | if (!oc || oc->dpms_state != DPMS_OFF) { |
| 250 | wlr_output_enable(wlr_output, true); | 250 | wlr_output_enable(wlr_output, true); |
| 251 | } | 251 | } |
| 252 | output_enable(output, oc); | 252 | return output_enable(output, oc); |
| 253 | return true; | ||
| 254 | } | 253 | } |
| 255 | 254 | ||
| 256 | if (oc && oc->dpms_state == DPMS_ON) { | 255 | if (oc && oc->dpms_state == DPMS_ON) { |