diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-12 22:02:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-12 22:02:03 -0400 |
| commit | de5d431eec05f8cc126491135e1f97f5022f7102 (patch) | |
| tree | c2d1f587fa0a718748ad0245dcbbeb14a4e2d4fc /src/core/hle/kernel/svc.cpp | |
| parent | 8da753ab8175a9ea6a394f057197b6d980f3bf66 (diff) | |
| parent | 5224cc49c4daa8d20999bad15a9b16d8d16b9d10 (diff) | |
Merge pull request #1041 from Subv/duplicated_mutex
Kernel/Mutex: Don't duplicate threads in the mutex waiter list.
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 5db2db687..5818cc06d 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -706,8 +706,7 @@ static ResultCode SignalProcessWideKey(VAddr condition_variable_addr, s32 target Handle owner_handle = static_cast<Handle>(mutex_val & Mutex::MutexOwnerMask); auto owner = g_handle_table.Get<Thread>(owner_handle); ASSERT(owner); - ASSERT(thread->status != ThreadStatus::Running); - thread->status = ThreadStatus::WaitMutex; + ASSERT(thread->status == ThreadStatus::WaitMutex); thread->wakeup_callback = nullptr; owner->AddMutexWaiter(thread); |