From f9945d81fb52c81ab60034dcfc41a2f36f0ed226 Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Tue, 29 Apr 2025 13:39:00 +0200 Subject: [PATCH] config/output: Fix missing output config supersedes color_transform and allow_tearing was not handled by supersede_output_config which could lead to configuration being incorrectly applied. --- sway/config/output.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sway/config/output.c b/sway/config/output.c index e061e25bd..df80cab64 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -129,6 +129,13 @@ static void supersede_output_config(struct output_config *dst, struct output_con if (src->render_bit_depth != RENDER_BIT_DEPTH_DEFAULT) { dst->render_bit_depth = RENDER_BIT_DEPTH_DEFAULT; } + if (src->set_color_transform) { + if (dst->color_transform) { + wlr_color_transform_unref(dst->color_transform); + dst->color_transform = NULL; + } + dst->set_color_transform = false; + } if (src->background) { free(dst->background); dst->background = NULL; @@ -144,6 +151,9 @@ static void supersede_output_config(struct output_config *dst, struct output_con if (src->power != -1) { dst->power = -1; } + if (src->allow_tearing != -1) { + dst->allow_tearing = -1; + } } // merge_output_config sets all fields in dst that were set in src