diff options
| author |  bunnei | 2018-08-15 18:25:30 -0400 |
|---|---|---|
| committer |  GitHub | 2018-08-15 18:25:30 -0400 |
| commit | 1dd27aff476f4831aab571442b0cc882a8bb0b95 (patch) | |
| tree | 1571009dc837518fcd3497ea54fe9e4bd5c66494 /src/core/hle/kernel/thread.cpp | |
| parent | Merge pull request #1080 from lioncash/ret (diff) | |
| parent | Core::CoreTiming: add UnscheduleEventThreadsafe (diff) | |
| download | yuzu-1dd27aff476f4831aab571442b0cc882a8bb0b95.tar.gz yuzu-1dd27aff476f4831aab571442b0cc882a8bb0b95.tar.xz yuzu-1dd27aff476f4831aab571442b0cc882a8bb0b95.zip | |
Merge pull request #1051 from B3n30/UnscheduleEventThreadsafe
Core::CoreTiming: add UnscheduleEventThreadsafe
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index a1a7867ce..cf4f94822 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -167,7 +167,7 @@ void Thread::WakeAfterDelay(s64 nanoseconds) { | |||
| 167 | } | 167 | } |
| 168 | 168 | ||
| 169 | void Thread::CancelWakeupTimer() { | 169 | void Thread::CancelWakeupTimer() { |
| 170 | CoreTiming::UnscheduleEvent(ThreadWakeupEventType, callback_handle); | 170 | CoreTiming::UnscheduleEventThreadsafe(ThreadWakeupEventType, callback_handle); |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | static boost::optional<s32> GetNextProcessorId(u64 mask) { | 173 | static boost::optional<s32> GetNextProcessorId(u64 mask) { |