diff options
author | Lioncash <mathew1800@gmail.com> | 2019-04-17 13:21:19 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-04-17 15:30:56 +0200 |
commit | c268ffd831bc8771585934e7e24da0f7e150936e (patch) | |
tree | ee35a6da18561f3b3d7a43a37081f7f175e62314 /src/core/hle/kernel/thread.cpp | |
parent | kernel/svc: Migrate svcCancelSynchronization behavior to a thread function (diff) | |
download | yuzu-c268ffd831bc8771585934e7e24da0f7e150936e.tar yuzu-c268ffd831bc8771585934e7e24da0f7e150936e.tar.gz yuzu-c268ffd831bc8771585934e7e24da0f7e150936e.tar.bz2 yuzu-c268ffd831bc8771585934e7e24da0f7e150936e.tar.lz yuzu-c268ffd831bc8771585934e7e24da0f7e150936e.tar.xz yuzu-c268ffd831bc8771585934e7e24da0f7e150936e.tar.zst yuzu-c268ffd831bc8771585934e7e24da0f7e150936e.zip |
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 7d4fe9608..2abf9efca 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -101,8 +101,7 @@ void Thread::ResumeFromWait() { ASSERT_MSG(wait_objects.empty(), "Thread is waking up while waiting for objects"); switch (status) { - case ThreadStatus::WaitSynchAll: - case ThreadStatus::WaitSynchAny: + case ThreadStatus::WaitSynch: case ThreadStatus::WaitHLEEvent: case ThreadStatus::WaitSleep: case ThreadStatus::WaitIPC: @@ -143,7 +142,7 @@ void Thread::ResumeFromWait() { } void Thread::CancelWait() { - ASSERT(GetStatus() == ThreadStatus::WaitSynchAny); + ASSERT(GetStatus() == ThreadStatus::WaitSynch); SetWaitSynchronizationResult(ERR_SYNCHRONIZATION_CANCELED); ResumeFromWait(); } |