diff options
| author |  bunnei | 2019-03-28 21:42:24 -0400 |
|---|---|---|
| committer |  GitHub | 2019-03-28 21:42:24 -0400 |
| commit | f770c17d011e76cb268df5ba5d687609a0f514d4 (patch) | |
| tree | 95638bae93a71b58d4c58ff5adb03d1256b3cb8a /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #2265 from FernandoS27/multilevelqueue (diff) | |
| parent | Fix small bug that kept a thread as a condvar thread after being signalled. (diff) | |
| download | yuzu-f770c17d011e76cb268df5ba5d687609a0f514d4.tar.gz yuzu-f770c17d011e76cb268df5ba5d687609a0f514d4.tar.xz yuzu-f770c17d011e76cb268df5ba5d687609a0f514d4.zip | |
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 a7e4ddc05..3b73be67b 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_ | |||
| 62 | 62 | ||
| 63 | if (thread->GetMutexWaitAddress() != 0 || thread->GetCondVarWaitAddress() != 0 || | 63 | if (thread->GetMutexWaitAddress() != 0 || thread->GetCondVarWaitAddress() != 0 || |
| 64 | thread->GetWaitHandle() != 0) { | 64 | thread->GetWaitHandle() != 0) { |
| 65 | ASSERT(thread->GetStatus() == ThreadStatus::WaitMutex); | 65 | ASSERT(thread->GetStatus() == ThreadStatus::WaitMutex || |
| 66 | thread->GetStatus() == ThreadStatus::WaitCondVar); | ||
| 66 | thread->SetMutexWaitAddress(0); | 67 | thread->SetMutexWaitAddress(0); |
| 67 | thread->SetCondVarWaitAddress(0); | 68 | thread->SetCondVarWaitAddress(0); |
| 68 | thread->SetWaitHandle(0); | 69 | thread->SetWaitHandle(0); |