From 353bf573784ff0914dad53dc24c6cb95a4a254f2 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 1 Sep 2019 13:24:57 +0200 Subject: [PATCH] WindowServer: Don't crash when trying to close an empty menu It's not normal to add empty menus to an app's menubar, but just in case someone does it anyway, let's not crash trying to close it. --- Servers/WindowServer/WSWindowManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Servers/WindowServer/WSWindowManager.cpp b/Servers/WindowServer/WSWindowManager.cpp index 56074469de..594240d27f 100644 --- a/Servers/WindowServer/WSWindowManager.cpp +++ b/Servers/WindowServer/WSWindowManager.cpp @@ -402,7 +402,7 @@ void WSWindowManager::close_current_menu() m_current_menu->menu_window()->set_visible(false); m_current_menu = nullptr; for (auto& menu : m_menu_manager.open_menu_stack()) { - if (menu) + if (menu && menu->menu_window()) menu->menu_window()->set_visible(false); } m_menu_manager.open_menu_stack().clear();