Skip to content

Commit a2db180

Browse files
committed
Merge pull request godotengine#113237 from Koyper/fix_popup_menu_signal_already_connected_error
[PopupMenu] Fix redundant attempts to connect popup hidden signal on submenu
2 parents 79432b6 + 3ae8863 commit a2db180

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

scene/gui/popup_menu.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,7 +1924,7 @@ void PopupMenu::add_submenu_node_item(const String &p_label, PopupMenu *p_submen
19241924
RID submenu_rid = p_submenu->bind_global_menu();
19251925
nmenu->set_item_submenu(global_menu, index, submenu_rid);
19261926
items.write[index].submenu_bound = true;
1927-
} else {
1927+
} else if (!p_submenu->is_connected("popup_hide", callable_mp(this, &PopupMenu::_submenu_hidden))) {
19281928
p_submenu->connect("popup_hide", callable_mp(this, &PopupMenu::_submenu_hidden));
19291929
}
19301930

@@ -2221,7 +2221,7 @@ void PopupMenu::set_item_submenu_node(int p_idx, PopupMenu *p_submenu) {
22212221
NativeMenu::get_singleton()->set_item_submenu(global_menu, p_idx, submenu_rid);
22222222
items.write[p_idx].submenu_bound = true;
22232223
}
2224-
} else {
2224+
} else if (!p_submenu->is_connected("popup_hide", callable_mp(this, &PopupMenu::_submenu_hidden))) {
22252225
p_submenu->connect("popup_hide", callable_mp(this, &PopupMenu::_submenu_hidden));
22262226
}
22272227
control->queue_redraw();

0 commit comments

Comments
 (0)