diff options
| author | 2016-05-21 17:45:18 +0300 | |
|---|---|---|
| committer | 2016-05-21 18:29:38 +0300 | |
| commit | 86ea7995ad6a6cb24fc02025e1a1241c00565809 (patch) | |
| tree | e397052f605f0d7b70792e329a7a6b5d39921fe3 /src | |
| parent | Merge pull request #1797 from MerryMage/audio-mixer (diff) | |
| download | yuzu-86ea7995ad6a6cb24fc02025e1a1241c00565809.tar.gz yuzu-86ea7995ad6a6cb24fc02025e1a1241c00565809.tar.xz yuzu-86ea7995ad6a6cb24fc02025e1a1241c00565809.zip | |
SVC::WaitSynchronizationN: Reschedule at the end
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/svc.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp index 2bf122a6d..0ce72de87 100644 --- a/src/core/hle/svc.cpp +++ b/src/core/hle/svc.cpp | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include "common/logging/log.h" | 7 | #include "common/logging/log.h" |
| 8 | #include "common/microprofile.h" | 8 | #include "common/microprofile.h" |
| 9 | #include "common/scope_exit.h" | ||
| 9 | #include "common/string_util.h" | 10 | #include "common/string_util.h" |
| 10 | #include "common/symbols.h" | 11 | #include "common/symbols.h" |
| 11 | 12 | ||
| @@ -326,9 +327,9 @@ static ResultCode WaitSynchronizationN(s32* out, Handle* handles, s32 handle_cou | |||
| 326 | } | 327 | } |
| 327 | } | 328 | } |
| 328 | 329 | ||
| 329 | HLE::Reschedule(__func__); | 330 | SCOPE_EXIT({HLE::Reschedule("WaitSynchronizationN");}); // Reschedule after putting the threads to sleep. |
| 330 | 331 | ||
| 331 | // If thread should wait, then set its state to waiting and then reschedule... | 332 | // If thread should wait, then set its state to waiting |
| 332 | if (wait_thread) { | 333 | if (wait_thread) { |
| 333 | 334 | ||
| 334 | // Actually wait the current thread on each object if we decided to wait... | 335 | // Actually wait the current thread on each object if we decided to wait... |