mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 01:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

desktop/output: Clear modeset timer on output manager apply

Browse source 
If a modeset timer exists at the time we apply an output manager config,
clear it to avoid a useless double commit.

(cherry picked from commit 63345977e2)
This commit is contained in:
Kenny Levinsen 2024-09-21 01:02:54 +02:00 committed by Simon Ser
parent 4ea5a9cee1
commit 75cfed65bb
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/desktop/output.c
View file

@ -657,6 +657,10 @@ static void output_manager_apply(struct sway_server *server,
done: done:
if (ok) { if (ok) {
wlr_output_configuration_v1_send_succeeded(cfg); wlr_output_configuration_v1_send_succeeded(cfg);
if (server->delayed_modeset != NULL) {
wl_event_source_remove(server->delayed_modeset);
server->delayed_modeset = NULL;
}
} else { } else {
wlr_output_configuration_v1_send_failed(cfg); wlr_output_configuration_v1_send_failed(cfg);
} }