all repos — mgba @ 9a0561e9c2fe3ccade7a97477f49cfcff70ac34a

mGBA Game Boy Advance Emulator

Core: Fix threading improperly setting paused state while interrupted
Vicki Pfau vi@endrift.com
Sat, 14 Nov 2020 02:29:39 -0800
commit

9a0561e9c2fe3ccade7a97477f49cfcff70ac34a

parent

01ed3f29909fe9e07eca95c5f3ed238f764b6148

2 files changed, 5 insertions(+), 1 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -48,6 +48,7 @@ - 3DS: Fix thread cleanup
  - All: Improve export headers (fixes mgba.io/i/1738)
  - CMake: Fix build with downstream minizip that exports incompatible symbols
  - Core: Ensure ELF regions can be written before trying
+ - Core: Fix threading improperly setting paused state while interrupted
  - Debugger: Don't skip undefined instructions when debugger attached
  - Debugger: Close trace log when done tracing
  - FFmpeg: Fix some small memory leaks
M src/core/thread.c → src/core/thread.c 
@@ -568,7 +568,10 @@
 void mCoreThreadPauseFromThread(struct mCoreThread* threadContext) {
 	bool frameOn = true;
 	MutexLock(&threadContext->impl->stateMutex);
-	if (threadContext->impl->state == THREAD_RUNNING || (threadContext->impl->interruptDepth && threadContext->impl->savedState == THREAD_RUNNING)) {
+	if (threadContext->impl->interruptDepth && threadContext->impl->savedState == THREAD_RUNNING) {
+		threadContext->impl->savedState = THREAD_PAUSING;
+		frameOn = false;
+	} else if (threadContext->impl->state == THREAD_RUNNING) {
 		threadContext->impl->state = THREAD_PAUSING;
 		frameOn = false;
 	}