summaryrefslogtreecommitdiffstats
path: root/platform/linuxbsd
diff options
context:
space:
mode:
authorbruvzg <7645683+bruvzg@users.noreply.github.com>2024-05-28 09:41:04 +0300
committerbruvzg <7645683+bruvzg@users.noreply.github.com>2024-05-28 09:41:04 +0300
commit1a40cda95e4323b38facba4376944a1eceafd39e (patch)
tree5738963114b558e0282b28f28c4e862c539d2258 /platform/linuxbsd
parentbe56cab58c056c074d1e02cd0b38641204e39f41 (diff)
downloadredot-engine-1a40cda95e4323b38facba4376944a1eceafd39e.tar.gz
[macOS, X11] Fix duplicate close requests.
Diffstat (limited to 'platform/linuxbsd')
-rw-r--r--platform/linuxbsd/x11/display_server_x11.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp
index 2c07acf94f..feb2f48101 100644
--- a/platform/linuxbsd/x11/display_server_x11.cpp
+++ b/platform/linuxbsd/x11/display_server_x11.cpp
@@ -4206,7 +4206,10 @@ void DisplayServerX11::popup_close(WindowID p_window) {
WindowID win_id = E->get();
popup_list.erase(E);
- _send_window_event(windows[win_id], DisplayServerX11::WINDOW_EVENT_CLOSE_REQUEST);
+ if (win_id != p_window) {
+ // Only request close on related windows, not this window. We are already processing it.
+ _send_window_event(windows[win_id], DisplayServerX11::WINDOW_EVENT_CLOSE_REQUEST);
+ }
E = F;
}
}