mirror of
https://github.com/godotengine/godot.git
synced 2024-11-21 19:42:43 +00:00
Merge pull request #90791 from timothyqiu/see-you-again
Fix potential infinite loop when using global menu
This commit is contained in:
commit
acd3d2497f
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user