citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #1837 from wwylele/sync-trap 

SVC::WaitSynchronizationN: Reschedule at the end
This commit is contained in:
bunnei 2016-05-22 20:07:20 -04:00
parent 51ee2d2eb1 86ea7995ad
commit e054e55ca2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/hle/svc.cpp
View File

@ -6,6 +6,7 @@
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/microprofile.h" #include "common/microprofile.h"
#include "common/scope_exit.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "common/symbols.h" #include "common/symbols.h"
@ -326,9 +327,9 @@ static ResultCode WaitSynchronizationN(s32* out, Handle* handles, s32 handle_cou
} }
} }
HLE::Reschedule(__func__); SCOPE_EXIT({HLE::Reschedule("WaitSynchronizationN");}); // Reschedule after putting the threads to sleep.
// If thread should wait, then set its state to waiting and then reschedule... // If thread should wait, then set its state to waiting
if (wait_thread) { if (wait_thread) {
// Actually wait the current thread on each object if we decided to wait... // Actually wait the current thread on each object if we decided to wait...