mirror of
https://github.com/swaywm/sway.git
synced 2024-11-21 23:41:27 +00:00
desktop/output: Clear modeset timer on output manager apply
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:
parent
4ea5a9cee1
commit
75cfed65bb
|
@ -657,6 +657,10 @@ static void output_manager_apply(struct sway_server *server,
|
|||
done:
|
||||
if (ok) {
|
||||
wlr_output_configuration_v1_send_succeeded(cfg);
|
||||
if (server->delayed_modeset != NULL) {
|
||||
wl_event_source_remove(server->delayed_modeset);
|
||||
server->delayed_modeset = NULL;
|
||||
}
|
||||
} else {
|
||||
wlr_output_configuration_v1_send_failed(cfg);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue