summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2015-01-11 19:18:52 +0100
committerSubv <subv2112@gmail.com>2015-01-11 19:18:52 +0100
commitb68d51ed3047fe45e270b6d23de615c3f8c4b58b (patch)
treedcc1db85180c38d4e0ea5ac88fa2c12cabcf301d
parentFix Windows build (diff)
downloadyuzu-b68d51ed3047fe45e270b6d23de615c3f8c4b58b.tar
yuzu-b68d51ed3047fe45e270b6d23de615c3f8c4b58b.tar.gz
yuzu-b68d51ed3047fe45e270b6d23de615c3f8c4b58b.tar.bz2
yuzu-b68d51ed3047fe45e270b6d23de615c3f8c4b58b.tar.lz
yuzu-b68d51ed3047fe45e270b6d23de615c3f8c4b58b.tar.xz
yuzu-b68d51ed3047fe45e270b6d23de615c3f8c4b58b.tar.zst
yuzu-b68d51ed3047fe45e270b6d23de615c3f8c4b58b.zip
-rw-r--r--src/core/hle/kernel/thread.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 0ae1a21df..6d126099b 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -263,6 +263,9 @@ void WakeThreadAfterDelay(Thread* thread, s64 nanoseconds) {
/// Resumes a thread from waiting by marking it as "ready"
void Thread::ResumeFromWait() {
+ // Cancel any outstanding wakeup events
+ CoreTiming::UnscheduleEvent(ThreadWakeupEventType, GetHandle());
+
status &= ~THREADSTATUS_WAIT;
wait_object = nullptr;
wait_type = WAITTYPE_NONE;