mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/wayland: update output mode after commit is done

Browse source 
Do not update the output mode if the commit failed in one of the
error codepaths.

(cherry picked from commit afa1a7f4ba)
This commit is contained in:
Simon Ser 2023-01-30 14:27:05 +01:00
parent f620b32dc3
commit 9a74139546
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
backend/wayland/output.c
View file

@ -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;
}