Skip to content

W
wine-cw
Commit 8f79fdc3 authored by Gerard Patel's avatar Gerard Patel Committed by Alexandre Julliard
Browse files
Options

Test if the menu is destroyed before displaying a menu item.

parent e60ccd11
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
controls/menu.c
View file @ 8f79fdc3
......@@ -1615,7 +1615,7 @@ static void MENU_SelectItem( HWND hwndOwner, HMENU hmenu, UINT wIndex,
TRACE("owner=0x%04x menu=0x%04x index=0x%04x select=0x%04x\n", hwndOwner, hmenu, wIndex, sendMenuSelect);
lppop = MENU_GetMenu( hmenu );
if ((!lppop) || (!lppop->nItems)) return;
if ((!lppop) || (!lppop->nItems) || (!lppop->hWnd)) return;
if (lppop->FocusedItem == wIndex) return;
if (lppop->wFlags & MF_POPUP) hdc = GetDC( lppop->hWnd );
......@@ -3791,7 +3791,10 @@ BOOL WINAPI DestroyMenu( HMENU hMenu )
lppop->wMagic = 0; /* Mark it as destroyed */
if ((lppop->wFlags & MF_POPUP) && lppop->hWnd)
{
DestroyWindow( lppop->hWnd );
lppop->hWnd = 0;
}
if (lppop->items) /* recursively destroy submenus */
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment