Clear menu handle after destroying menu.

38db0980 · Guy Albertelli · Alexandre Julliard · f12b70ad · 38db0980
Commit 38db0980 authored May 11, 2000 by Guy Albertelli Committed by Alexandre Julliard May 11, 2000
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

win.c windows/win.c +10 -2

No files found.
--- a/windows/win.c
+++ b/windows/win.c
@@ -507,8 +507,16 @@ static WND* WIN_DestroyWindow( WND* wndPtr )
    }

    if (!(wndPtr->dwStyle & WS_CHILD))
-       if (wndPtr->wIDmenu) DestroyMenu( (HMENU)wndPtr->wIDmenu );
-    if (wndPtr->hSysMenu) DestroyMenu( wndPtr->hSysMenu );
+       if (wndPtr->wIDmenu)
+       {
+	   DestroyMenu( wndPtr->wIDmenu );
+	   wndPtr->wIDmenu = 0;
+       }
+    if (wndPtr->hSysMenu)
+    {
+	DestroyMenu( wndPtr->hSysMenu );
+	wndPtr->hSysMenu = 0;
+    }
    wndPtr->pDriver->pDestroyWindow( wndPtr );
    DCE_FreeWindowDCE( wndPtr );    /* Always do this to catch orphaned DCs */ 
    WINPROC_FreeProc( wndPtr->winproc, WIN_PROC_WINDOW );