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.
This commit is contained in:
Kenny Levinsen 2024-09-21 01:02:54 +02:00 committed by Alexander Orzechowski
parent cdff4f7c74
commit 63345977e2

View file

@ -607,6 +607,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);
} }