diff options
| author | Kenny Levinsen <kl@kl.wtf> | 2025-04-29 13:39:00 +0200 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2025-05-18 23:55:44 +0200 |
| commit | 6db0dd5abf56257029d82c437a9dde18d09d48ac (patch) | |
| tree | 5777ca31d8f511b55ad0c03f62bdcb774cc13002 | |
| parent | 983af1a9b674c68b67c4c18a26c60940eb91e2a2 (diff) | |
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.
(cherry picked from commit f9945d81fb52c81ab60034dcfc41a2f36f0ed226)
| -rw-r--r-- | sway/config/output.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index e061e25b..df80cab6 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 |