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

Merge pull request #15739 from poke1024/macos-catch-exception 

Catch NSException in macOS run loop to prevent crashs
This commit is contained in:
Max Hilbrunner 2018-05-13 23:51:20 +02:00 committed by GitHub
parent af6513b7ff 3ff18ee61e
commit 0db3d1d2a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
platform/osx/os_osx.mm
View File

@ -2427,12 +2427,21 @@ void OS_OSX::run() {
//int frames=0;
//uint64_t frame=0;
while (!force_quit) {
bool quit = false;
process_events(); // get rid of pending events
joypad_osx->process_joypads();
if (Main::iteration() == true)
break;
while (!force_quit && !quit) {
@try {
process_events(); // get rid of pending events
joypad_osx->process_joypads();
if (Main::iteration() == true) {
quit = true;
}
} @catch (NSException *exception) {
ERR_PRINTS("NSException: " + String([exception reason].UTF8String));
}
};
main_loop->finish();