summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2018-08-13 00:47:15 +0200
committerSubv <subv2112@gmail.com>2018-08-13 01:40:56 +0200
commit0135b328edb1b58d1ff97cfdc35e05f02cec1c2a (patch)
treea06b72074fc7ef0ae0e69c9ecf83773adabb1308 /src/core/hle
parentMerge pull request #1029 from bunnei/fix-out-attrib (diff)
downloadyuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar
yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar.gz
yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar.bz2
yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar.lz
yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar.xz
yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.tar.zst
yuzu-0135b328edb1b58d1ff97cfdc35e05f02cec1c2a.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/kernel/thread.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index b9022feae..e308b9c7b 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -155,8 +155,10 @@ void Thread::WakeAfterDelay(s64 nanoseconds) {
if (nanoseconds == -1)
return;
- CoreTiming::ScheduleEvent(CoreTiming::nsToCycles(nanoseconds), ThreadWakeupEventType,
- callback_handle);
+ // This function might be called from any thread so we have to be cautious and use the
+ // thread-safe version of ScheduleEvent.
+ CoreTiming::ScheduleEventThreadsafe(CoreTiming::nsToCycles(nanoseconds), ThreadWakeupEventType,
+ callback_handle);
}
void Thread::CancelWakeupTimer() {