Changeset 1311 for trunk/src/user32/pmwindow.cpp

Timestamp:

Oct 15, 1999, 3:52:56 PM (26 years ago)

Author:

sandervl

Message:

Window destruction fixes

File:

• trunk/src/user32/pmwindow.cpp (modified) (3 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.29 1999-10-15 09:26:22 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.30 1999-10-15 13:52:54 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -261 +261 @@
 
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
-            if (win32wnd->isChild())
-                hParent = win32wnd->getParent()->getOS2WindowHandle();
+            if (win32wnd->isChild()) {
+                if(win32wnd->getParent()) {
+                        hParent = win32wnd->getParent()->getOS2WindowHandle();
+                }
+                else    break;
+            }
             else
                 hFrame = win32wnd->getOS2FrameWindowHandle();
@@ -294 +298 @@
 
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
-            if (win32wnd->isChild())
-                hParent = win32wnd->getParent()->getOS2WindowHandle();
+            if (win32wnd->isChild()) {
+                if(win32wnd->getParent()) {
+                        hParent = win32wnd->getParent()->getOS2WindowHandle();
+                }
+                else    goto RunDefWndProc; //parent has just been destroyed
+            }
             else
                 hFrame = WinQueryWindow(hwnd, QW_PARENT);