diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-01-31 10:40:16 -0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-02-02 15:37:02 -0200 |
| commit | ec9c7732518a441ce740ef9e813fd85cc1d7410c (patch) | |
| tree | 7e6768fd00613936ec8aaeeb51ba3eb517b954f8 /src/core/hle | |
| parent | 8441591659a5176ab9d75309d4ecc9c2d6716e91 (diff) | |
Kernel: Remove previous scheduled event when a Timer is re-Set
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 503a5d2ce..794be060c 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -38,6 +38,9 @@ void Timer::Acquire() { } void Timer::Set(s64 initial, s64 interval) { + // Ensure we get rid of any previous scheduled event + Cancel(); + initial_delay = initial; interval_delay = interval; |