Changeset 2089 for trunk/src

Timestamp:

Dec 16, 1999, 1:47:21 AM (26 years ago)

Author:

sandervl

Message:

Fix for crash during destruction of window with children

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.111 1999-12-16 00:11:46 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.112 1999-12-16 00:47:21 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -786 +786 @@
  ULONG rc;
  Win32BaseWindow *child;
+ HWND hwnd = getWindowHandle();
 
     if (isSubclassedOS2Wnd) OSLibWinSubclassWindow(OS2Hwnd,pOldWndProc);
@@ -805 +806 @@
     }
     SendInternalMessageA(WM_DESTROY, 0, 0);
+    if(::IsWindow(hwnd) == FALSE) {
+        //object already destroyed, so return immediately
+        return 1;
+    }
     SendInternalMessageA(WM_NCDESTROY, 0, 0);