Skip to content

Fix Explorer crash when Open-Shell exits while the menu is open #2576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ge0rdi merged 1 commit into from
Nov 7, 2026
Merged

Fix Explorer crash when Open-Shell exits while the menu is open #2576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3314,14 +3314,17 @@ static void CleanStartMenuDLL( void )
ClearIatHook(g_ShellRegisterHotKeyHook);
g_ShellRegisterHotKeyHook=NULL;

CloseManagers(false);
ClearIatHooks();

// cleanup
// close the menu and the settings before the managers. an open menu calls g_SearchManager.CloseMenu() when it is destroyed,
// and after CloseManagers that would use the search manager's deleted lock and crash Explorer (exiting with the menu open)
if (g_Owner.m_hWnd) g_Owner.DestroyWindow();
CloseSettings();
CMenuContainer::CloseStartMenu();
CMenuFader::ClearAll();

CloseManagers(false);
ClearIatHooks();

// cleanup
UnhookDropTarget();
EnableHotkeys(HOTKEYS_CLEAR);
HWND hwnd=FindWindow(L"OpenShellMenu.CStartHookWindow",L"StartHookWindow");
Expand Down