RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-29 13:15:08 +00:00
Code Issues Activity Actions

WindowServer: Do not add existing menu items (by ptr) to m_menus

Browse source 
This resolves a fixme requesting that we do not add duplicate menus
This commit is contained in:
Cody Hein 2023-01-03 13:22:08 -07:00 • committed by Sam Atkins
parent 8a87aa85ae
commit 9a05175a88
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Services/WindowServer/Menubar.h
View file

@ -18,7 +18,20 @@ class Menubar {
public: public:
void add_menu(Menu& menu, Gfx::IntRect window_rect) void add_menu(Menu& menu, Gfx::IntRect window_rect)
{ {
// FIXME: Check against duplicate menu additions. bool duplicate_menu_detected = false;
for_each_menu([&](Menu& existing_menu) {
if (&menu == &existing_menu) {
dbgln("Duplicate Menu \"{}\" ({})", menu.name(), &menu);
duplicate_menu_detected = true;
return IterationDecision::Break;
}
return IterationDecision::Continue;
});
if (duplicate_menu_detected) {
return;
}
m_menus.append(menu); m_menus.append(menu);
layout_menu(menu, window_rect); layout_menu(menu, window_rect);
} }