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

Merge pull request #466 from Subv/wake 

Thread: Prevent waking a thread multiple times.
This commit is contained in:
bunnei 2015-01-11 13:39:23 -05:00
parent 63d05fca36 b68d51ed30
commit 542b0b0057
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/hle/kernel/thread.cpp
View File

@ -263,6 +263,9 @@ void WakeThreadAfterDelay(Thread* thread, s64 nanoseconds) {
/// Resumes a thread from waiting by marking it as "ready" /// Resumes a thread from waiting by marking it as "ready"
void Thread::ResumeFromWait() { void Thread::ResumeFromWait() {
// Cancel any outstanding wakeup events
CoreTiming::UnscheduleEvent(ThreadWakeupEventType, GetHandle());
status &= ~THREADSTATUS_WAIT; status &= ~THREADSTATUS_WAIT;
wait_object = nullptr; wait_object = nullptr;
wait_type = WAITTYPE_NONE; wait_type = WAITTYPE_NONE;