godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #104615 from bruvzg/cleanup_fix

Browse Source 
[macOS] Fix cleanup with some command line tools.
This commit is contained in:
Rémi Verschelde
2025-03-25 23:08:23 +01:00
parent b699508b07 698ff2a192
commit 594d64ec24
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/macos/godot_application_delegate.mm
View File

@@ -240,7 +240,7 @@
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender { - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender {
DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton(); DisplayServerMacOS *ds = (DisplayServerMacOS *)DisplayServer::get_singleton();
if (ds) { if (ds && ds->has_window(DisplayServerMacOS::MAIN_WINDOW_ID)) {
ds->send_window_event(ds->get_window(DisplayServerMacOS::MAIN_WINDOW_ID), DisplayServerMacOS::WINDOW_EVENT_CLOSE_REQUEST); ds->send_window_event(ds->get_window(DisplayServerMacOS::MAIN_WINDOW_ID), DisplayServerMacOS::WINDOW_EVENT_CLOSE_REQUEST);
} }
OS_MacOS *os = (OS_MacOS *)OS::get_singleton(); OS_MacOS *os = (OS_MacOS *)OS::get_singleton();

2
platform/macos/os_macos.mm
View File

@@ -882,11 +882,11 @@ void OS_MacOS::terminate() {
void OS_MacOS::cleanup() { void OS_MacOS::cleanup() {
if (main_loop) { if (main_loop) {
main_loop->finalize(); main_loop->finalize();
}
@autoreleasepool { @autoreleasepool {
Main::cleanup(); Main::cleanup();
} }
} }
}
OS_MacOS::OS_MacOS(const char *p_execpath, int p_argc, char **p_argv) { OS_MacOS::OS_MacOS(const char *p_execpath, int p_argc, char **p_argv) {
execpath = p_execpath; execpath = p_execpath;