Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-06 23:31:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97678 from bruvzg/fix_nd_menu

Browse Source 
[macOS] Fix menu crash when used from opened native dialog.
This commit is contained in:
Rémi Verschelde
2024-10-04 11:21:54 +02:00
parent 6d9a797ea4 4c8f8e6980
commit dedb2ff217
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/macos/godot_menu_delegate.mm
View File

@@ -102,9 +102,13 @@
} else { } else {
// Otherwise redirect event to the engine. // Otherwise redirect event to the engine.
if (DisplayServer::get_singleton()) { if (DisplayServer::get_singleton()) {
if ([[NSApplication sharedApplication] keyWindow].sheet) {
[[[[NSApplication sharedApplication] keyWindow] sheetParent] sendEvent:event];
} else {
[[[NSApplication sharedApplication] keyWindow] sendEvent:event]; [[[NSApplication sharedApplication] keyWindow] sendEvent:event];
} }
} }
}
// Suppress default menu action. // Suppress default menu action.
*target = self; *target = self;