RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:07:34 +00:00
Code Issues Activity Actions

WindowServer: Fix crash removing modal windows

Browse source 
Calling Window::is_modal requires the window to be on a window stack,
so we need to check this before removing it from the window stack.
This commit is contained in:
Tom 2021-07-05 10:53:09 -06:00 • committed by Andreas Kling
parent 598842c5b7
commit 96155009dd
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Services/WindowServer/WindowManager.cpp
View file

@ -395,6 +395,7 @@ void WindowManager::remove_window(Window& window)
check_hide_geometry_overlay(window); check_hide_geometry_overlay(window);
auto* active = active_window(); auto* active = active_window();
auto* active_input = active_input_window(); auto* active_input = active_input_window();
bool was_modal = window.is_modal(); // This requires the window to be on a window stack still!
window.window_stack().remove(window); window.window_stack().remove(window);
if (active == &window || active_input == &window || (active && window.is_descendant_of(*active)) || (active_input && active_input != active && window.is_descendant_of(*active_input))) if (active == &window || active_input == &window || (active && window.is_descendant_of(*active)) || (active_input && active_input != active && window.is_descendant_of(*active_input)))
pick_new_active_window(&window); pick_new_active_window(&window);
@ -406,10 +407,10 @@ void WindowManager::remove_window(Window& window)
Compositor::the().invalidate_occlusions(); Compositor::the().invalidate_occlusions();
for_each_window_manager([&window](WMClientConnection& conn) { for_each_window_manager([&](WMClientConnection& conn) {
if (conn.window_id() < 0 || !(conn.event_mask() & WMEventMask::WindowRemovals)) if (conn.window_id() < 0 || !(conn.event_mask() & WMEventMask::WindowRemovals))
return IterationDecision::Continue; return IterationDecision::Continue;
if (!window.is_internal() && !window.is_modal()) if (!window.is_internal() && !was_modal)
conn.async_window_removed(conn.window_id(), window.client_id(), window.window_id()); conn.async_window_removed(conn.window_id(), window.client_id(), window.window_id());
return IterationDecision::Continue; return IterationDecision::Continue;
}); });