From be22072492332ce2c120840de1abbabab0233c7f Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 8 Mar 2024 12:31:30 +0100 Subject: [PATCH] desktop/output: merge power management config on top of current one Don't replace an existing config with a blank one with just the power field set. Logic borrowed from apply_output_config_to_outputs(). --- sway/desktop/output.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 600423bcf..f9819cdf9 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -644,6 +644,12 @@ void handle_output_power_manager_set_mode(struct wl_listener *listener, oc->power = 1; break; } - oc = store_output_config(oc); - apply_output_config(oc, output); + + struct output_config *current = find_output_config(output); + if (!current) { + current = new_output_config(oc->name); + merge_output_config(current, oc); + } + apply_output_config(current, output); + free_output_config(current); }