From 1c51564896178999be5c4232e890ad5484200b1a Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Mon, 26 Aug 2013 22:47:08 -0700 Subject: [PATCH] Stop practicing thread necromancy. --- Core/HLE/sceKernelThread.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 5b09e01af3..dd87b449e6 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -2951,8 +2951,7 @@ void Thread::resumeFromWait() if (action) { action->status &= ~THREADSTATUS_WAIT; - // TODO: What if DORMANT or DEAD? - if (!(action->status & THREADSTATUS_WAITSUSPEND)) + if (!(action->status & (THREADSTATUS_WAITSUSPEND | THREADSTATUS_DORMANT | THREADSTATUS_DEAD))) action->status = THREADSTATUS_READY; // Non-waiting threads do not process callbacks. @@ -2961,8 +2960,7 @@ void Thread::resumeFromWait() else { this->nt.status &= ~THREADSTATUS_WAIT; - // TODO: What if DORMANT or DEAD? - if (!(this->nt.status & THREADSTATUS_WAITSUSPEND)) + if (!(this->nt.status & (THREADSTATUS_WAITSUSPEND | THREADSTATUS_DORMANT | THREADSTATUS_DEAD))) __KernelChangeReadyState(this, this->GetUID(), true); // Non-waiting threads do not process callbacks.