diff options
| author | 2019-11-23 13:23:23 -0500 | |
|---|---|---|
| committer | 2019-11-23 13:23:23 -0500 | |
| commit | 6e4d46908af55e16afca1aa05aeab47e20ab49f5 (patch) | |
| tree | ce0f6fd75e88b90325ab2673964c2b07234bb3d0 /src/core/hle/kernel/svc.cpp | |
| parent | Merge pull request #3140 from FearlessTobi/port-4953 (diff) | |
| parent | Kernel: Correct Cancel Synchronization. (diff) | |
| download | yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar.gz yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.tar.xz yuzu-6e4d46908af55e16afca1aa05aeab47e20ab49f5.zip | |
Merge pull request #3130 from FernandoS27/cancel-sync
Kernel: Correct Cancel Synchronization.
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 5 |
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 | |||
| 505 | return RESULT_TIMEOUT; | 505 | return RESULT_TIMEOUT; |
| 506 | } | 506 | } |
| 507 | 507 | ||
| 508 | if (thread->IsSyncCancelled()) { | ||
| 509 | thread->SetSyncCancelled(false); | ||
| 510 | return ERR_SYNCHRONIZATION_CANCELED; | ||
| 511 | } | ||
| 512 | |||
| 508 | for (auto& object : objects) { | 513 | for (auto& object : objects) { |
| 509 | object->AddWaitingThread(thread); | 514 | object->AddWaitingThread(thread); |
| 510 | } | 515 | } |