mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-04-22 12:35:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

WindowServer: set_active_window() should not assume window has a client

Browse source 
I saw this assertion fire once and I don't know how I made it happen,
but it seems fine for client-less windows to become active, they just
don't have a menubar to install.
This commit is contained in:
Andreas Kling 2020-07-07 15:37:53 +02:00
parent e0e100f009
commit 7527b9ee72
Notes: sideshowbarker 2024-07-19 05:02:17 +09:00
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Services/WindowServer/WindowManager.cpp
View file

@ -1030,10 +1030,11 @@ void WindowManager::set_active_window(Window* window)
active_client = m_active_window->client();
Core::EventLoop::current().post_event(*m_active_window, make<Event>(Event::WindowActivated));
m_active_window->invalidate();
auto* client = window->client();
ASSERT(client);
MenuManager::the().set_current_menubar(client->app_menubar());
if (auto* client = window->client()) {
MenuManager::the().set_current_menubar(client->app_menubar());
} else {
MenuManager::the().set_current_menubar(nullptr);
}
tell_wm_listeners_window_state_changed(*m_active_window);
} else {
MenuManager::the().set_current_menubar(nullptr);