summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/svc.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-04-17 13:08:12 +0200
committerLioncash <mathew1800@gmail.com>2019-04-17 15:30:56 +0200
commit433b59c1121a257ae3c1503fff5b71d3f3852ab5 (patch)
tree23f4cbe699ff28d3f5907aff55f49081623d419b /src/core/hle/kernel/svc.cpp
parentMerge pull request #2315 from ReinUsesLisp/severity-decompiler (diff)
downloadyuzu-433b59c1121a257ae3c1503fff5b71d3f3852ab5.tar
yuzu-433b59c1121a257ae3c1503fff5b71d3f3852ab5.tar.gz
yuzu-433b59c1121a257ae3c1503fff5b71d3f3852ab5.tar.bz2
yuzu-433b59c1121a257ae3c1503fff5b71d3f3852ab5.tar.lz
yuzu-433b59c1121a257ae3c1503fff5b71d3f3852ab5.tar.xz
yuzu-433b59c1121a257ae3c1503fff5b71d3f3852ab5.tar.zst
yuzu-433b59c1121a257ae3c1503fff5b71d3f3852ab5.zip
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
-rw-r--r--src/core/hle/kernel/svc.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index d48a2203a..b25190882 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -518,16 +518,14 @@ static ResultCode CancelSynchronization(Core::System& system, Handle thread_hand
LOG_TRACE(Kernel_SVC, "called thread=0x{:X}", thread_handle);
const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();
- const SharedPtr<Thread> thread = handle_table.Get<Thread>(thread_handle);
+ SharedPtr<Thread> thread = handle_table.Get<Thread>(thread_handle);
if (!thread) {
LOG_ERROR(Kernel_SVC, "Thread handle does not exist, thread_handle=0x{:08X}",
thread_handle);
return ERR_INVALID_HANDLE;
}
- ASSERT(thread->GetStatus() == ThreadStatus::WaitSynchAny);
- thread->SetWaitSynchronizationResult(ERR_SYNCHRONIZATION_CANCELED);
- thread->ResumeFromWait();
+ thread->CancelWait();
return RESULT_SUCCESS;
}