From a1e69d1c4f067393366a7591cfd9e459863fd9ed Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Thu, 4 Jul 2013 01:58:16 -0700 Subject: [PATCH] Fix wrong thread id when resuming after interrupt. Who knows what kind of havoc this was causing. --- Core/HLE/sceKernelThread.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 5b19d4ed72..076de140f9 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -1011,6 +1011,8 @@ void __KernelFireThreadEnd(SceUID threadID) // TODO: Use __KernelChangeThreadState instead? It has other affects... void __KernelChangeReadyState(Thread *thread, SceUID threadID, bool ready) { + // Passing the id as a parameter is just an optimization, if it's wrong it will cause havoc. + _dbg_assert_msg_(HLE, thread->GetUID() == threadID, "Incorrect threadID"); int prio = thread->nt.currentPriority; if (thread->isReady()) @@ -1101,7 +1103,7 @@ bool __KernelSwitchToThread(SceUID threadID, const char *reason) { Thread *current = __GetCurrentThread(); if (current && current->isRunning()) - __KernelChangeReadyState(current, threadID, true); + __KernelChangeReadyState(current, currentThread, true); __KernelSwitchContext(t, reason); return true;