Merge pull request #2266 from FernandoS27/arbitration

Kernel: Fixes to Arbitration and SignalProcessWideKey Management
This commit is contained in:
bunnei
2019-03-28 21:42:24 -04:00
committed by GitHub
6 changed files with 22 additions and 14 deletions

View File

@ -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);