diff options
| author | Subv <subv2112@gmail.com> | 2016-12-10 19:29:31 +0100 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2016-12-10 19:29:31 +0100 |
| commit | 406907d57055965780e04769482556995de8c50a (patch) | |
| tree | f9e355eccba394047b32160e8f7574a74f46772b /src/core/hle/kernel/thread.cpp | |
| parent | WaitSynch: Removed unused variables and reduced SharedPtr copies. (diff) | |
| download | yuzu-406907d57055965780e04769482556995de8c50a.tar yuzu-406907d57055965780e04769482556995de8c50a.tar.gz yuzu-406907d57055965780e04769482556995de8c50a.tar.bz2 yuzu-406907d57055965780e04769482556995de8c50a.tar.lz yuzu-406907d57055965780e04769482556995de8c50a.tar.xz yuzu-406907d57055965780e04769482556995de8c50a.tar.zst yuzu-406907d57055965780e04769482556995de8c50a.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 49ed9d899..4bbc08516 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -277,6 +277,10 @@ static void ThreadWakeupCallback(u64 thread_handle, int cycles_late) { if (thread->status == THREADSTATUS_WAIT_SYNCH || thread->status == THREADSTATUS_WAIT_ARB) { thread->wait_set_output = false; + // Remove the thread from each of its waiting objects' waitlists + for (auto& object : thread->wait_objects) + object->RemoveWaitingThread(thread.get()); + thread->wait_objects.clear(); thread->SetWaitSynchronizationResult(ResultCode(ErrorDescription::Timeout, ErrorModule::OS, ErrorSummary::StatusChanged, ErrorLevel::Info)); |