ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL: Fix game crash check

This commit is contained in:
Vicki Pfau 2017-04-02 16:47:46 -07:00
parent 10fe4a743c
commit 35b5626053
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -31,6 +31,7 @@ Bugfixes:
- Qt: Fix linking after some windows have been closed - Qt: Fix linking after some windows have been closed
- GBA Video: Fix wrong palette on 256-color sprites in OBJWIN - GBA Video: Fix wrong palette on 256-color sprites in OBJWIN
- Windows: Fix VDir.rewind - Windows: Fix VDir.rewind
- SDL: Fix game crash check
Misc: Misc:
- SDL: Remove scancode key input - SDL: Remove scancode key input
- GBA Video: Clean up unused timers - GBA Video: Clean up unused timers

9
src/platform/sdl/main.c
View File

@ -194,6 +194,10 @@ int mSDLRun(struct mSDLRenderer* renderer, struct mArguments* args) {
if (mCoreThreadStart(&thread)) { if (mCoreThreadStart(&thread)) {
renderer->runloop(renderer, &thread); renderer->runloop(renderer, &thread);
mSDLPauseAudio(&renderer->audio); mSDLPauseAudio(&renderer->audio);
if (mCoreThreadHasCrashed(&thread)) {
didFail = true;
printf("The game crashed!\n");
}
mCoreThreadJoin(&thread); mCoreThreadJoin(&thread);
} else { } else {
didFail = true; didFail = true;
@ -204,11 +208,6 @@ int mSDLRun(struct mSDLRenderer* renderer, struct mArguments* args) {
mSDLResumeScreensaver(&renderer->events); mSDLResumeScreensaver(&renderer->events);
mSDLSetScreensaverSuspendable(&renderer->events, false); mSDLSetScreensaverSuspendable(&renderer->events, false);
#endif #endif
if (mCoreThreadHasCrashed(&thread)) {
didFail = true;
printf("The game crashed!\n");
}
} }
renderer->core->unloadROM(renderer->core); renderer->core->unloadROM(renderer->core);
return didFail; return didFail;