M CHANGES → CHANGES

@@ -30,6 +30,7 @@ - PSP2: Improved controller rumble
  - GB, GBA: Prevent loading null ROMs
  - VFS: Allow truncating memory chunk VFiles
  - Debugger: Modularize CLI debugger
+ - Core: Clean up some thread state checks
 
 0.5.1: (2016-10-05)
 Bugfixes:

M src/core/thread.c → src/core/thread.c

@@ -478,6 +478,14 @@ }
 
 void mCoreThreadSetRewinding(struct mCoreThread* threadContext, bool rewinding) {
 	MutexLock(&threadContext->stateMutex);
+	if (rewinding && (threadContext->state == THREAD_REWINDING || (threadContext->state == THREAD_INTERRUPTING && threadContext->savedState == THREAD_REWINDING))) {
+		MutexUnlock(&threadContext->stateMutex);
+		return;
+	}
+	if (!rewinding && (threadContext->state == THREAD_RUNNING || (threadContext->state == THREAD_INTERRUPTING && threadContext->savedState == THREAD_RUNNING))) {
+		MutexUnlock(&threadContext->stateMutex);
+		return;
+	}
 	_waitOnInterrupt(threadContext);
 	if (rewinding && threadContext->state == THREAD_RUNNING) {
 		threadContext->state = THREAD_REWINDING;