diff options
| author | Kenny Levinsen <kl@kl.wtf> | 2024-09-21 01:02:54 +0200 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2024-09-29 17:27:14 +0200 |
| commit | 75cfed65bb79e30c92e756590039fb824fe63e14 (patch) | |
| tree | e9da9fe178ed704b76d4f7d6727fdd685201bf24 | |
| parent | 4ea5a9cee140377bdf1aae699c801ef497cb9899 (diff) | |
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 63345977e2c411359a049c40cf2c1044a22b4f4a)
| -rw-r--r-- | sway/desktop/output.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 1f5b73d9..0a19ad57 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -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); } |