diff options
| author | bunnei <bunneidev@gmail.com> | 2019-11-23 19:23:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-23 19:23:23 +0100 |
| commit | 6e4d46908af55e16afca1aa05aeab47e20ab49f5 (patch) | |
| tree | ce0f6fd75e88b90325ab2673964c2b07234bb3d0 /src/core/hle/kernel/thread.cpp | |
| parent | Merge pull request #3140 from FearlessTobi/port-4953 (diff) | |
| parent | Kernel: Correct Cancel Synchronization. (diff) | |
| download | yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar.gz yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar.bz2 yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar.lz yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar.xz yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar.zst yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.zip | |
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index ee7531f2d..ab0e82ac2 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -120,8 +120,11 @@ void Thread::ResumeFromWait() { } void Thread::CancelWait() { - ASSERT(GetStatus() == ThreadStatus::WaitSynch); - ClearWaitObjects(); + if (GetSchedulingStatus() != ThreadSchedStatus::Paused) { + is_sync_cancelled = true; + return; + } + is_sync_cancelled = false; SetWaitSynchronizationResult(ERR_SYNCHRONIZATION_CANCELED); ResumeFromWait(); } |