diff options
| author |  bunnei | 2018-08-12 22:02:03 -0400 |
|---|---|---|
| committer |  GitHub | 2018-08-12 22:02:03 -0400 |
| commit | de5d431eec05f8cc126491135e1f97f5022f7102 (patch) | |
| tree | c2d1f587fa0a718748ad0245dcbbeb14a4e2d4fc /src/core/hle/kernel/svc.cpp | |
| parent | Merge pull request #1040 from bunnei/xmad (diff) | |
| parent | Kernel/Mutex: Don't duplicate threads in the mutex waiter list. (diff) | |
| download | yuzu-de5d431eec05f8cc126491135e1f97f5022f7102.tar.gz yuzu-de5d431eec05f8cc126491135e1f97f5022f7102.tar.xz yuzu-de5d431eec05f8cc126491135e1f97f5022f7102.zip | |
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 | |||
| 706 | Handle owner_handle = static_cast<Handle>(mutex_val & Mutex::MutexOwnerMask); | 706 | Handle owner_handle = static_cast<Handle>(mutex_val & Mutex::MutexOwnerMask); |
| 707 | auto owner = g_handle_table.Get<Thread>(owner_handle); | 707 | auto owner = g_handle_table.Get<Thread>(owner_handle); |
| 708 | ASSERT(owner); | 708 | ASSERT(owner); |
| 709 | ASSERT(thread->status != ThreadStatus::Running); | 709 | ASSERT(thread->status == ThreadStatus::WaitMutex); |
| 710 | thread->status = ThreadStatus::WaitMutex; | ||
| 711 | thread->wakeup_callback = nullptr; | 710 | thread->wakeup_callback = nullptr; |
| 712 | 711 | ||
| 713 | owner->AddMutexWaiter(thread); | 712 | owner->AddMutexWaiter(thread); |