diff --git a/dll/win32/shell32/shellmenu/CMenuBand.cpp b/dll/win32/shell32/shellmenu/CMenuBand.cpp index c46a7326345..48407ab1d59 100644 --- a/dll/win32/shell32/shellmenu/CMenuBand.cpp +++ b/dll/win32/shell32/shellmenu/CMenuBand.cpp @@ -861,7 +861,8 @@ HRESULT CMenuBand::_TrackContextMenu(IContextMenu * contextMenu, INT x, INT y) _MenuItemSelect(MPOS_FULLCANCEL); TRACE("Before InvokeCommand\n"); - CMINVOKECOMMANDINFO cmi = { sizeof(cmi), 0, hwnd }; + // Note: Not passing hwnd to InvokeCommand because it can be a BaseBar window that is about to die + CMINVOKECOMMANDINFO cmi = { sizeof(cmi), 0, NULL }; cmi.lpVerb = MAKEINTRESOURCEA(uCommand - idCmdFirst); if (GetKeyState(VK_SHIFT) < 0) cmi.fMask |= CMIC_MASK_SHIFT_DOWN;