diff options
| author | Kenny Levinsen <kl@kl.wtf> | 2024-09-21 01:02:54 +0200 |
|---|---|---|
| committer | Alexander Orzechowski <alex@ozal.ski> | 2024-09-21 17:50:24 -0400 |
| commit | 63345977e2c411359a049c40cf2c1044a22b4f4a (patch) | |
| tree | 77790a329c947c58868e472df0b7944eedb9d739 | |
| parent | cdff4f7c74b76e9141164b8c154621646140d8ec (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.
| -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 c919f139..1f1f8d68 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); } |