Changeset 22043 for trunk/src/user32/win32wbase.cpp

Timestamp:

Nov 1, 2012, 2:42:26 AM (13 years ago)

Author:

dmik

Message:

user32: Prevent debug assertion.

File:

• trunk/src/user32/win32wbase.cpp (modified) (1 diff)

trunk/src/user32/win32wbase.cpp

@@ -874 +874 @@
         }
     }
-    SendMessageA(getWindowHandle(),WM_DESTROY, 0, 0);
+
+    // there may be no window proc already (reset to null with SetWindowLong by
+    // the application), avoid the debug assertion
+    if (win32wndproc)
+        SendMessageA(getWindowHandle(),WM_DESTROY, 0, 0);
+
     if(::IsWindow(hwnd) == FALSE) {
         //object already destroyed, so return immediately
         return 1;
     }
-    SendMessageA(getWindowHandle(),WM_NCDESTROY, 0, 0);
+
+    if (win32wndproc)
+        SendMessageA(getWindowHandle(),WM_NCDESTROY, 0, 0);
 
     TIMER_KillTimerFromWindow(getWindowHandle());