summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-01-31 13:40:16 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-02-02 18:37:02 +0100
commitec9c7732518a441ce740ef9e813fd85cc1d7410c (patch)
tree7e6768fd00613936ec8aaeeb51ba3eb517b954f8 /src/core
parentFS: Remove use of GetHandle (diff)
downloadyuzu-ec9c7732518a441ce740ef9e813fd85cc1d7410c.tar
yuzu-ec9c7732518a441ce740ef9e813fd85cc1d7410c.tar.gz
yuzu-ec9c7732518a441ce740ef9e813fd85cc1d7410c.tar.bz2
yuzu-ec9c7732518a441ce740ef9e813fd85cc1d7410c.tar.lz
yuzu-ec9c7732518a441ce740ef9e813fd85cc1d7410c.tar.xz
yuzu-ec9c7732518a441ce740ef9e813fd85cc1d7410c.tar.zst
yuzu-ec9c7732518a441ce740ef9e813fd85cc1d7410c.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/timer.cpp3
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;