From 6476f690febe067eb190a648fdc7797d7c68c54d Mon Sep 17 00:00:00 2001 From: Brendan Coles Date: Tue, 7 Apr 2020 17:59:48 +0000 Subject: [PATCH] WindowServer: Menu::popup() should return when the menu is empty Previously the WindowServer would assert `!is_empty()` and crash. Fixes #1689 --- Servers/WindowServer/Menu.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Servers/WindowServer/Menu.cpp b/Servers/WindowServer/Menu.cpp index e02d4a2031b..64b8720716b 100644 --- a/Servers/WindowServer/Menu.cpp +++ b/Servers/WindowServer/Menu.cpp @@ -519,7 +519,10 @@ void Menu::redraw_if_theme_changed() void Menu::popup(const Gfx::Point& position, bool is_submenu) { - ASSERT(!is_empty()); + if (is_empty()) { + dbg() << "Menu: Empty menu popup"; + return; + } auto& window = ensure_menu_window(); redraw_if_theme_changed();