ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Fix interrupting a thread while on the thread (fixes #692)

This commit is contained in:
Vicki Pfau 2017-06-28 13:07:39 -07:00
parent 23a346e8ce
commit dc5c59d4db
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -73,6 +73,7 @@ Bugfixes:
- OpenGL: Fix some shaders causing offset graphics - OpenGL: Fix some shaders causing offset graphics
- Qt: Fix game unpausing after frame advancing and refocusing - Qt: Fix game unpausing after frame advancing and refocusing
- GB Timer: Fix sub-M-cycle DIV reset timing and edge triggering - GB Timer: Fix sub-M-cycle DIV reset timing and edge triggering
- Core: Fix interrupting a thread while on the thread (fixes mgba.io/i/692)
Misc: Misc:
- SDL: Remove scancode key input - SDL: Remove scancode key input
- GBA Video: Clean up unused timers - GBA Video: Clean up unused timers

5
src/core/thread.c
View File

@ -401,11 +401,14 @@ void mCoreThreadInterruptFromThread(struct mCoreThread* threadContext) {
MutexLock(&threadContext->stateMutex); MutexLock(&threadContext->stateMutex);
++threadContext->interruptDepth; ++threadContext->interruptDepth;
if (threadContext->interruptDepth > 1 || !mCoreThreadIsActive(threadContext)) { if (threadContext->interruptDepth > 1 || !mCoreThreadIsActive(threadContext)) {
if (threadContext->state == THREAD_INTERRUPTING) {
threadContext->state = THREAD_INTERRUPTED;
}
MutexUnlock(&threadContext->stateMutex); MutexUnlock(&threadContext->stateMutex);
return; return;
} }
threadContext->savedState = threadContext->state; threadContext->savedState = threadContext->state;
threadContext->state = THREAD_INTERRUPTING; threadContext->state = THREAD_INTERRUPTED;
ConditionWake(&threadContext->stateCond); ConditionWake(&threadContext->stateCond);
MutexUnlock(&threadContext->stateMutex); MutexUnlock(&threadContext->stateMutex);
} }