From 9661ed4285e7f7298851a45c0770cd2b9c9839b9 Mon Sep 17 00:00:00 2001
From: Jos Dehaes <jos.dehaes@gmail.com>
Date: Wed, 15 Apr 2026 14:36:56 +0200
Subject: [PATCH] server: cancel pending auto-raise on config reload

If the user disables raiseOnFocus or lowers raiseOnFocusDelay while
a raise is queued, the queued raise should not fire against the new
config. Cancel it in reload_config_and_theme() before rereading the
rc.xml.
---
 src/server.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/server.c b/src/server.c
index e4b27026..c792d8b4 100644
--- a/src/server.c
+++ b/src/server.c
@@ -89,6 +89,12 @@ reload_config_and_theme(void)
 	/* Avoid UAF when dialog client is used during reconfigure */
 	action_prompts_destroy();
 
+	/*
+	 * Cancel any pending auto-raise before reloading config in case the
+	 * raiseOnFocusDelay option was disabled or changed.
+	 */
+	desktop_cancel_pending_auto_raise();
+
 	scaled_buffer_invalidate_sharing();
 	rcxml_finish();
 	rcxml_read(rc.config_file);