diff options
| author | Subv <subv2112@gmail.com> | 2015-12-29 20:35:25 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2015-12-29 20:35:25 -0500 |
| commit | 6cccc36505f65161086a532f66e5bb200f47757a (patch) | |
| tree | bc4333e77d864f69065f1de41a0ca2c362a62909 /src/core/hle/kernel/timer.cpp | |
| parent | 73740d74ed1dabccc8304a0ac4cfb737c91864ba (diff) | |
HLE/Timers: Reset OneShot timers when they are acquired instead of when they're triggered.
Closes #1139
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 08b3ea8c0b..ce6bbd7197 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -42,6 +42,9 @@ bool Timer::ShouldWait() { void Timer::Acquire() { ASSERT_MSG( !ShouldWait(), "object unavailable!"); + + if (reset_type == RESETTYPE_ONESHOT) + signaled = false; } void Timer::Set(s64 initial, s64 interval) { @@ -84,9 +87,6 @@ static void TimerCallback(u64 timer_handle, int cycles_late) { // Resume all waiting threads timer->WakeupAllWaitingThreads(); - if (timer->reset_type == RESETTYPE_ONESHOT) - timer->signaled = false; - if (timer->interval_delay != 0) { // Reschedule the timer with the interval delay u64 interval_microseconds = timer->interval_delay / 1000; |