diff options
| author | 2020-03-03 13:02:50 -0400 | |
|---|---|---|
| committer | 2020-06-27 11:35:22 -0400 | |
| commit | 75e10578f12cf64bd734388ba80b5f5a46ca6133 (patch) | |
| tree | 4ba3fa4053193e03407dbfdd6d9d742537406000 /src/core/hle/kernel/svc.cpp | |
| parent | Process: Protect TLS region and Modules. (diff) | |
| download | yuzu-75e10578f12cf64bd734388ba80b5f5a46ca6133.tar.gz yuzu-75e10578f12cf64bd734388ba80b5f5a46ca6133.tar.xz yuzu-75e10578f12cf64bd734388ba80b5f5a46ca6133.zip | |
Core: Correct HLE Event Callbacks and other issues.
Diffstat (limited to 'src/core/hle/kernel/svc.cpp')
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 4c1040a3b..9f46a1758 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -333,17 +333,16 @@ static ResultCode SendSyncRequest(Core::System& system, Handle handle) { | |||
| 333 | thread->SetStatus(ThreadStatus::WaitIPC); | 333 | thread->SetStatus(ThreadStatus::WaitIPC); |
| 334 | session->SendSyncRequest(SharedFrom(thread), system.Memory()); | 334 | session->SendSyncRequest(SharedFrom(thread), system.Memory()); |
| 335 | } | 335 | } |
| 336 | ResultCode result = thread->GetSignalingResult(); | ||
| 337 | if (thread->HasHLECallback()) { | 336 | if (thread->HasHLECallback()) { |
| 338 | Handle event_handle = thread->GetHLETimeEvent(); | 337 | Handle event_handle = thread->GetHLETimeEvent(); |
| 339 | if (event_handle != InvalidHandle) { | 338 | if (event_handle != InvalidHandle) { |
| 340 | auto& time_manager = system.Kernel().TimeManager(); | 339 | auto& time_manager = system.Kernel().TimeManager(); |
| 341 | time_manager.UnscheduleTimeEvent(event_handle); | 340 | time_manager.UnscheduleTimeEvent(event_handle); |
| 342 | } | 341 | } |
| 343 | thread->InvokeHLECallback(ThreadWakeupReason::Timeout, SharedFrom(thread), nullptr, 0); | 342 | thread->InvokeHLECallback(SharedFrom(thread)); |
| 344 | } | 343 | } |
| 345 | 344 | ||
| 346 | return result; | 345 | return RESULT_SUCCESS; |
| 347 | } | 346 | } |
| 348 | 347 | ||
| 349 | static ResultCode SendSyncRequest32(Core::System& system, Handle handle) { | 348 | static ResultCode SendSyncRequest32(Core::System& system, Handle handle) { |