From afa1a7f4ba9b98d43fc69d1438a48dc08d600b91 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 30 Jan 2023 14:27:05 +0100 Subject: [PATCH] backend/wayland: update output mode after commit is done Do not update the output mode if the commit failed in one of the error codepaths. --- backend/wayland/output.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/wayland/output.c b/backend/wayland/output.c index 0a256890..152c879f 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -287,11 +287,6 @@ static bool output_commit(struct wlr_output *wlr_output, return false; } - if (state->committed & WLR_OUTPUT_STATE_MODE) { - wlr_output_update_custom_mode(wlr_output, - state->custom_mode.width, state->custom_mode.height, 0); - } - if (state->committed & WLR_OUTPUT_STATE_BUFFER) { struct wp_presentation_feedback *wp_feedback = NULL; if (output->backend->presentation != NULL) { @@ -360,6 +355,11 @@ static bool output_commit(struct wlr_output *wlr_output, wl_display_flush(output->backend->remote_display); + if (state->committed & WLR_OUTPUT_STATE_MODE) { + wlr_output_update_custom_mode(wlr_output, + state->custom_mode.width, state->custom_mode.height, 0); + } + return true; }