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

[macOS] Fix running with DisplayServerHeadless.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-03-26 20:27:11 +02:00
parent 594d64ec24
commit 5665e55f9a
5 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
platform/macos/os_macos.mm
View File

@@ -51,8 +51,13 @@ void OS_MacOS::pre_wait_observer_cb(CFRunLoopObserverRef p_observer, CFRunLoopAc
@autoreleasepool {
@try {
if (DisplayServer::get_singleton()) {
static_cast<DisplayServerMacOS *>(DisplayServer::get_singleton())->_process_events(false); // Get rid of pending events.
// Get rid of pending events.
DisplayServer *ds = DisplayServer::get_singleton();
DisplayServerMacOS *ds_mac = Object::cast_to<DisplayServerMacOS>(ds);
if (ds_mac) {
ds_mac->_process_events(false);
} else if (ds) {
ds->process_events();
}
os->joypad_apple->process_joypads();
@@ -839,6 +844,8 @@ void OS_MacOS::start_main() {
}
if (err == OK) {
main_stared = true;
int ret;
@autoreleasepool {
ret = Main::start();
@@ -883,8 +890,10 @@ void OS_MacOS::cleanup() {
if (main_loop) {
main_loop->finalize();
}
@autoreleasepool {
Main::cleanup();
if (main_stared) {
@autoreleasepool {
Main::cleanup();
}
}
}