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

Perf: Fix race condition if a game crashes immediately on start

This commit is contained in:
Jeffrey Pfau 2015-05-10 08:22:03 -07:00
parent 6f24064f4f
commit 73d2c8fda8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -54,6 +54,7 @@ Bugfixes:
- SDL: Fix potential build issues when Qt and SDL2 are in use - SDL: Fix potential build issues when Qt and SDL2 are in use
- GBA Memory: Fix jumping to invalid memory when switching from Thumb to ARM - GBA Memory: Fix jumping to invalid memory when switching from Thumb to ARM
- GBA Video: Fix second frame mode 5 - GBA Video: Fix second frame mode 5
- Perf: Fix race condition if a game crashes immediately on start
Misc: Misc:
- Qt: Show multiplayer numbers in window title - Qt: Show multiplayer numbers in window title
- Qt: Handle saving input settings better - Qt: Handle saving input settings better

7
src/platform/perf-main.c
View File

@ -96,7 +96,14 @@ int main(int argc, char** argv) {
if (!didStart) { if (!didStart) {
goto cleanup; goto cleanup;
} }
GBAThreadInterrupt(&context);
if (GBAThreadHasCrashed(&context)) {
GBAThreadJoin(&context);
goto cleanup;
}
GBAGetGameCode(context.gba, gameCode); GBAGetGameCode(context.gba, gameCode);
GBAThreadContinue(&context);
int frames = perfOpts.frames; int frames = perfOpts.frames;
if (!frames) { if (!frames) {