godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Fix BadWindow error when stopping embedded game on Linux

This commit is contained in:
Hilderin 2025-01-25 20:30:40 -05:00
parent b15b24b087
commit 725dd4930e
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/linuxbsd/x11/display_server_x11.cpp
View File

@ -5853,6 +5853,9 @@ Error DisplayServerX11::remove_embedded_process(OS::ProcessID p_pid) {
// Handle bad window errors silently because just in case the embedded window was closed. // Handle bad window errors silently because just in case the embedded window was closed.
int (*oldHandler)(Display *, XErrorEvent *) = XSetErrorHandler(&bad_window_error_handler); int (*oldHandler)(Display *, XErrorEvent *) = XSetErrorHandler(&bad_window_error_handler);
// Check if the window is still valid.
XWindowAttributes attr;
if (XGetWindowAttributes(x11_display, ep->process_window, &attr)) {
// Send the message to gracefully close the window. // Send the message to gracefully close the window.
XEvent ev; XEvent ev;
memset(&ev, 0, sizeof(ev)); memset(&ev, 0, sizeof(ev));
@ -5863,6 +5866,7 @@ Error DisplayServerX11::remove_embedded_process(OS::ProcessID p_pid) {
ev.xclient.data.l[0] = XInternAtom(x11_display, "WM_DELETE_WINDOW", False); ev.xclient.data.l[0] = XInternAtom(x11_display, "WM_DELETE_WINDOW", False);
ev.xclient.data.l[1] = CurrentTime; ev.xclient.data.l[1] = CurrentTime;
XSendEvent(x11_display, ep->process_window, False, NoEventMask, &ev); XSendEvent(x11_display, ep->process_window, False, NoEventMask, &ev);
}
// Restore default error handler. // Restore default error handler.
XSetErrorHandler(oldHandler); XSetErrorHandler(oldHandler);