system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 18:15:58 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

WindowServer: MenuManager::handle_mouse_event() return if window is null

Browse source 
Previously the WindowServer would assert `topmost_menu->menu_window()`
and crash.

Fixes #1716
This commit is contained in:
Brendan Coles 2020-04-09 17:44:59 +00:00 committed by Andreas Kling
parent fec8763c21
commit 64536f19f0
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Servers/WindowServer/MenuManager.cpp
View file

@ -172,7 +172,10 @@ void MenuManager::handle_mouse_event(MouseEvent& mouse_event)
auto* topmost_menu = m_open_menu_stack.last().ptr();
ASSERT(topmost_menu);
auto* window = topmost_menu->menu_window();
ASSERT(window);
if (!window) {
dbg() << "MenuManager::handle_mouse_event: No menu window";
return;
}
ASSERT(window->is_visible());
bool event_is_inside_current_menu = window->rect().contains(mouse_event.position());