RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-16 18:42:07 +00:00
Code Issues Activity Actions

WindowServer: Close all menus belonging to a client when it disconnects

Browse source 
Previously we would be left with a menu stack containing nulled-out
WeakPtr's to menus in the now-disconnected clients.

This was tripping up an assertion when clicking anywhere after shutting
down a program while it had a menu open.
This commit is contained in:
Andreas Kling 2020-01-02 20:03:32 +01:00
parent 9fe316c2d8
commit 0ac95ec510
3 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Servers/WindowServer/WSClientConnection.cpp
View file

@ -49,6 +49,7 @@ WSClientConnection::WSClientConnection(CLocalSocket& client_socket, int client_i
WSClientConnection::~WSClientConnection()
{
WSWindowManager::the().menu_manager().close_all_menus_from_client({}, *this);
auto windows = move(m_windows);
}

9
Servers/WindowServer/WSMenuManager.cpp
View file

@ -171,6 +171,15 @@ void WSMenuManager::set_needs_window_resize()
m_needs_window_resize = true;
}
void WSMenuManager::close_all_menus_from_client(Badge<WSClientConnection>, WSClientConnection & client)
{
if (m_open_menu_stack.is_empty())
return;
if (m_open_menu_stack.first()->client() != &client)
return;
close_everyone();
}
void WSMenuManager::close_everyone()
{
for (auto& menu : m_open_menu_stack) {

2
Servers/WindowServer/WSMenuManager.h
View file

@ -34,6 +34,8 @@ public:
void close_everyone_not_in_lineage(WSMenu&);
void close_menu_and_descendants(WSMenu&);
void close_all_menus_from_client(Badge<WSClientConnection>, WSClientConnection&);
void add_applet(WSWindow&);
void remove_applet(WSWindow&);
void invalidate_applet(const WSWindow&, const Rect&);