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

GBA Thread: Fix GBARunOnThread to not trample old state

This commit is contained in:
Jeffrey Pfau 2015-05-31 21:44:34 -07:00
parent 3dc8d7d4c9
commit d67481c9de
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gba/supervisor/thread.c
View File

@ -279,7 +279,7 @@ static THREAD_ENTRY _GBAThreadRun(void* context) {
if (threadContext->run) {
threadContext->run(threadContext);
}
threadContext->state = THREAD_RUNNING;
threadContext->state = threadContext->savedState;
ConditionWake(&threadContext->stateCond);
}
if (threadContext->state == THREAD_RESETING) {
@ -610,6 +610,7 @@ void GBARunOnThread(struct GBAThread* threadContext, void (*run)(struct GBAThrea
MutexLock(&threadContext->stateMutex);
threadContext->run = run;
_waitOnInterrupt(threadContext);
threadContext->savedState = threadContext->state;
threadContext->state = THREAD_RUN_ON;
threadContext->gba->cpu->nextEvent = 0;
ConditionWake(&threadContext->stateCond);