all repos — mgba @ ff99a859c1978aaf2daeb6afdd3818374428b5eb

mGBA Game Boy Advance Emulator

GBA Thread: Allow halted games to exit cleanly
Jeffrey Pfau jeffrey@endrift.com
Tue, 16 Dec 2014 22:36:46 -0800
commit

ff99a859c1978aaf2daeb6afdd3818374428b5eb

parent

c9a38dbc7084e9677cc417245deed1c2b3ecdeb0

2 files changed, 2 insertions(+), 0 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -2,6 +2,7 @@ 0.1.1: (Future)
 Bugfixes:
  - Qt: Fix issue with set frame sizes being the wrong height
  - Qt: Fix emulator crashing when full screen if a game is not running
+ - GBA Thread: Allow halted games to exit cleanly
 Misc:
  - Qt: Disable sync to video by default
M src/gba/gba-thread.c → src/gba/gba-thread.c 
@@ -354,6 +354,7 @@ if (threadContext->debugger && threadContext->debugger->state == DEBUGGER_RUNNING) {
 		threadContext->debugger->state = DEBUGGER_EXITING;
 	}
 	threadContext->state = THREAD_EXITING;
+	threadContext->gba->cpu->halted = false;
 	ConditionWake(&threadContext->stateCond);
 	MutexUnlock(&threadContext->stateMutex);
 	MutexLock(&threadContext->sync.audioBufferMutex);