godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75254 from bruvzg/macos_menu_cb_loop 

[macOS] Fix infinite loop caused by global menu callbacks which trigger EditorProgress dialog.
This commit is contained in:
Yuri Sizov 2023-03-30 23:09:42 +02:00 committed by GitHub
parent dbf1a7277f 48730e3b77
commit db77702177
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/macos/display_server_macos.h
View File

@ -188,7 +188,7 @@ private:
Variant tag;
Callable callback;
};
Vector<MenuCall> deferred_menu_calls;
List<MenuCall> deferred_menu_calls;
const NSMenu *_get_menu_root(const String &p_menu_root) const;
NSMenu *_get_menu_root(const String &p_menu_root);

10
platform/macos/display_server_macos.mm
View File

@ -3521,14 +3521,16 @@ void DisplayServerMacOS::process_events() {
}
// Process "menu_callback"s.
for (MenuCall &E : deferred_menu_calls) {
Variant tag = E.tag;
while (List<MenuCall>::Element *call_p = deferred_menu_calls.front()) {
MenuCall call = call_p->get();
deferred_menu_calls.pop_front(); // Remove before call to avoid infinite loop in case callback is using `process_events` (e.g. EditorProgress).
Variant tag = call.tag;
Variant *tagp = &tag;
Variant ret;
Callable::CallError ce;
E.callback.callp((const Variant **)&tagp, 1, ret, ce);
call.callback.callp((const Variant **)&tagp, 1, ret, ce);
}
deferred_menu_calls.clear();
if (!drop_events) {
_process_key_events();