From 87ca06730895a1adb6b0355b3c9a386e1d8b3acd Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 13 Sep 2026 06:12:32 +0300
Subject: [PATCH 74/74] gtk4(x): Fix meswin_dialog_is_open()

See RM #2241

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 client/gui-gtk-4.0/messagewin.c | 4 +++-
 client/gui-gtk-5.0/messagewin.c | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/gui-gtk-4.0/messagewin.c b/client/gui-gtk-4.0/messagewin.c
index 619a8319d8..1ea1572e72 100644
--- a/client/gui-gtk-4.0/messagewin.c
+++ b/client/gui-gtk-4.0/messagewin.c
@@ -448,7 +448,9 @@ void meswin_dialog_popdown(void)
 ****************************************************************************/
 bool meswin_dialog_is_open(void)
 {
-  return (NULL != meswin.shell);
+  return meswin.shell != NULL
+    && (meswin.shell->type != GUI_DIALOG_WINDOW
+        || meswin.shell->v.window != NULL);
 }
 
 /************************************************************************//**
diff --git a/client/gui-gtk-5.0/messagewin.c b/client/gui-gtk-5.0/messagewin.c
index 20763ce47c..bb3baf446a 100644
--- a/client/gui-gtk-5.0/messagewin.c
+++ b/client/gui-gtk-5.0/messagewin.c
@@ -448,7 +448,9 @@ void meswin_dialog_popdown(void)
 ****************************************************************************/
 bool meswin_dialog_is_open(void)
 {
-  return (NULL != meswin.shell);
+  return meswin.shell != NULL
+    && (meswin.shell->type != GUI_DIALOG_WINDOW
+        || meswin.shell->v.window != NULL);
 }
 
 /************************************************************************//**
-- 
2.53.0

