summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/svc.cpp
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-11-16 16:05:39 +0100
committerFernandoS27 <fsahmkow27@gmail.com>2019-11-16 17:41:51 +0100
commit7d16b2d2ddd170a24cc09f258fbf2e56f34b009d (patch)
treea76350979c9df80abaeb271173b09f0fcf488070 /src/core/hle/kernel/svc.cpp
parentMerge pull request #3113 from lioncash/semi (diff)
downloadyuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.tar
yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.tar.gz
yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.tar.bz2
yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.tar.lz
yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.tar.xz
yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.tar.zst
yuzu-7d16b2d2ddd170a24cc09f258fbf2e56f34b009d.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/svc.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index c63a9ba8b..b2cef3be9 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -505,6 +505,11 @@ static ResultCode WaitSynchronization(Core::System& system, Handle* index, VAddr
return RESULT_TIMEOUT;
}
+ if (thread->IsSyncCancelled()) {
+ thread->SetSyncCancelled(false);
+ return ERR_SYNCHRONIZATION_CANCELED;
+ }
+
for (auto& object : objects) {
object->AddWaitingThread(thread);
}