diff options
| author | bunnei <bunneidev@gmail.com> | 2019-11-23 13:23:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-23 13:23:23 -0500 |
| commit | 6e4d46908af55e16afca1aa05aeab47e20ab49f5 (patch) | |
| tree | ce0f6fd75e88b90325ab2673964c2b07234bb3d0 /src/core/hle/kernel/thread.cpp | |
| parent | bedc903c656faa0d39aaf7352eaecf2153a634e8 (diff) | |
| parent | 7d16b2d2ddd170a24cc09f258fbf2e56f34b009d (diff) | |
Merge pull request #3130 from FernandoS27/cancel-sync
Kernel: Correct Cancel Synchronization.
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(); } |