diff options
| author | Sebastian Valle <subv2112@gmail.com> | 2016-12-16 08:48:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-16 08:48:22 -0500 |
| commit | d25a37966d705c5b2e672d0c146b09d1efb893f3 (patch) | |
| tree | b5fb8c8be9ad32336b8aa6f8b587b0db245c749a /src | |
| parent | cda7210fade53a96fcba5fe5cd6dfd7b604f8277 (diff) | |
| parent | 4c9b80cee389d9b2d4ff3437aa70cda2b1754382 (diff) | |
Merge pull request #2338 from wwylele/fix-dead
Kernel: remove object's waiting thread if it is dead
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 209d35270..1db8e102f 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -35,7 +35,8 @@ void WaitObject::RemoveWaitingThread(Thread* thread) { SharedPtr<Thread> WaitObject::GetHighestPriorityReadyThread() { // Remove the threads that are ready or already running from our waitlist boost::range::remove_erase_if(waiting_threads, [](const SharedPtr<Thread>& thread) { - return thread->status == THREADSTATUS_RUNNING || thread->status == THREADSTATUS_READY; + return thread->status == THREADSTATUS_RUNNING || thread->status == THREADSTATUS_READY || + thread->status == THREADSTATUS_DEAD; }); // TODO(Subv): This call should be performed inside the loop below to check if an object can be |