commit 3a3cd9fab1ab8796120ddb91abd390188292b895
author Francois Boisvert <francois@macadamian.com> Sun Mar 28 12:42:52 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Mar 28 12:42:52 1999 +0000
tree 81109b10c8f7cf8ee8345e84b81a82ede80d124a
parent 0dddc09bc4516b164ebe49c783b6322dbc85257c

Fixed some bugs in thread safeness for wnd struct.

controls/menu.c

diff --git a/controls/menu.c b/controls/menu.c
index cd406b4..14af490 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -3544,8 +3544,6 @@
 	        (!pTPWnd || (lppop->hWnd != pTPWnd->hwndSelf)))
 	        DestroyWindow( lppop->hWnd );
 
-            MENU_ReleaseTopPopupWnd();
-            
 	    if (lppop->items)	/* recursively destroy submenus */
 	    {
 	        int i;
@@ -3558,8 +3556,13 @@
 	        HeapFree( SystemHeap, 0, lppop->items );
 	    }
 	    USER_HEAP_FREE( hMenu );
+            MENU_ReleaseTopPopupWnd();
 	}
-	else return FALSE;
+        else
+        {
+            MENU_ReleaseTopPopupWnd();
+            return FALSE;
+        }
     }
     return (hMenu != MENU_DefSysPopup);
 }