From 9c1ec8c96d0d3b6abd775cbe3501cf9f1fb46cae 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 4f546846d..7136ca1b0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ Features:
 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 12442a79b..25c2dfb3a 100644
--- a/src/gba/gba-thread.c
+++ b/src/gba/gba-thread.c
@@ -357,6 +357,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);