From ff99a859c1978aaf2daeb6afdd3818374428b5eb Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Tue, 16 Dec 2014 22:36:46 -0800
Subject: [PATCH] GBA Thread: Allow halted games to exit cleanly

---
 CHANGES              | 1 +
 src/gba/gba-thread.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 7fb019804..0bbba111f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 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
 
diff --git a/src/gba/gba-thread.c b/src/gba/gba-thread.c
index 1cf9006c5..9ceeb5455 100644
--- a/src/gba/gba-thread.c
+++ b/src/gba/gba-thread.c
@@ -354,6 +354,7 @@ void GBAThreadEnd(struct GBAThread* threadContext) {
 		threadContext->debugger->state = DEBUGGER_EXITING;
 	}
 	threadContext->state = THREAD_EXITING;
+	threadContext->gba->cpu->halted = false;
 	ConditionWake(&threadContext->stateCond);
 	MutexUnlock(&threadContext->stateMutex);
 	MutexLock(&threadContext->sync.audioBufferMutex);