Skip to content

Commit

Permalink
Merge pull request #90791 from timothyqiu/see-you-again
Browse files Browse the repository at this point in the history
Fix potential infinite loop when using global menu
  • Loading branch information
akien-mga committed Apr 17, 2024
2 parents 8293aac + 43ed8d4 commit acd3d24
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion servers/display_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ String DisplayServer::global_menu_get_item_submenu(const String &p_menu_root, in
ERR_FAIL_NULL_V(nmenu, String());
RID rid = nmenu->get_item_submenu(_get_rid_from_name(nmenu, p_menu_root), p_idx);
if (!nmenu->is_system_menu(rid)) {
for (HashMap<String, RID>::Iterator E = menu_names.begin(); E;) {
for (HashMap<String, RID>::Iterator E = menu_names.begin(); E; ++E) {
if (E->value == rid) {
return E->key;
}
Expand Down

0 comments on commit acd3d24

Please sign in to comment.