aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/output.c
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2020-02-11 14:09:15 +0100
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2020-02-11 20:52:02 -0500
commit5e9008046846093140eeaf7187150b04670fbc94 (patch)
treea103dededf3b4bb700992bed2552f8fd90368f2f /sway/desktop/output.c
parentFix output scale auto-detection (diff)
downloadsway-5e9008046846093140eeaf7187150b04670fbc94.tar.gz
sway-5e9008046846093140eeaf7187150b04670fbc94.tar.zst
sway-5e9008046846093140eeaf7187150b04670fbc94.zip
Call apply_output_config instead of output_enable
apply_output_config will call output_enable if necessary. This fixes a lone wlr_output_enable call (without a matching wlr_output_commit call) which was a no-op.
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r--sway/desktop/output.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index afe43d2c..ec662a8c 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -896,11 +896,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
896 output_repaint_timer_handler, output); 896 output_repaint_timer_handler, output);
897 897
898 struct output_config *oc = find_output_config(output); 898 struct output_config *oc = find_output_config(output);
899 if (!oc || oc->enabled) { 899 apply_output_config(oc, output);
900 output_enable(output, oc);
901 } else {
902 wlr_output_enable(output->wlr_output, false);
903 }
904 free_output_config(oc); 900 free_output_config(oc);
905 901
906 transaction_commit_dirty(); 902 transaction_commit_dirty();