Don't dispatch events to destroyed windows.

bbidulock · Jun 15, 2024 · 9fd6e41 · 9fd6e41
1 parent 3be1fb7
commit 9fd6e41
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/yxapp.cc b/src/yxapp.cc
@@ -628,11 +628,13 @@ void YXApplication::dispatchEvent(YWindow *win, XEvent &xev) {
                 w = w->getFocusWindow();
         }
 
-        for (; w && (w->handleKey(xev.xkey) == false); w = w->parent()) {
+        for (; w; w = w->parent()) {
+            if (w->destroyed() || w->handleKey(xev.xkey))
+                break;
             if (fGrabTree && w == fXGrabWindow)
                 break;
         }
-    } else {
+    } else if (win->destroyed() == false) {
         Window child;
 
         if (xev.type == MotionNotify) {
@@ -698,7 +700,7 @@ void YXApplication::handleGrabEvent(YWindow *winx, XEvent &xev) {
         }
         if (win.ptr == nullptr)
             return ;
-        {
+        else {
             YWindow *p = win.ptr;
             for (; p; p = p->parent()) {
                 if (p == fXGrabWindow)