diff options
| author | bunnei <bunneidev@gmail.com> | 2019-03-28 21:42:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 21:42:24 -0400 |
| commit | f770c17d011e76cb268df5ba5d687609a0f514d4 (patch) | |
| tree | 95638bae93a71b58d4c58ff5adb03d1256b3cb8a /src/core/hle/kernel/kernel.cpp | |
| parent | b404fcdf1443b91ac9994c05ad1fe039fcd9675e (diff) | |
| parent | 9c7319a4d423a20c45cd8d7898c2f73659526d33 (diff) | |
Merge pull request #2266 from FernandoS27/arbitration
Kernel: Fixes to Arbitration and SignalProcessWideKey Management
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -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 a7e4ddc05c..3b73be67ba 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -62,7 +62,8 @@ static void ThreadWakeupCallback(u64 thread_handle, [[maybe_unused]] s64 cycles_ if (thread->GetMutexWaitAddress() != 0 || thread->GetCondVarWaitAddress() != 0 || thread->GetWaitHandle() != 0) { - ASSERT(thread->GetStatus() == ThreadStatus::WaitMutex); + ASSERT(thread->GetStatus() == ThreadStatus::WaitMutex || + thread->GetStatus() == ThreadStatus::WaitCondVar); thread->SetMutexWaitAddress(0); thread->SetCondVarWaitAddress(0); thread->SetWaitHandle(0); |