From e52a89732550f0ac30f7267cc7bab64fb7d55579 Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Sat, 21 Sep 2024 01:02:54 +0200 Subject: [PATCH] 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. --- sway/desktop/output.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sway/desktop/output.c b/sway/desktop/output.c index c919f1398..1f1f8d682 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -607,6 +607,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); }