aboutsummaryrefslogtreecommitdiff
path: root/backends/timer/default
diff options
context:
space:
mode:
authorPaul Gilbert2013-07-04 08:44:49 -0400
committerPaul Gilbert2013-07-04 08:44:49 -0400
commitfa737fd5af3763a152e92c4b74c114876b3a8573 (patch)
tree3e698f9c095ba692c6e305b35785a8f45f5e061b /backends/timer/default
parenta49a7d5ad4f4435ed8cee0934c94155586f2dd99 (diff)
parentbaafae672f3489b0eaf77c22be0c65ba31e6b73d (diff)
downloadscummvm-rg350-fa737fd5af3763a152e92c4b74c114876b3a8573.tar.gz
scummvm-rg350-fa737fd5af3763a152e92c4b74c114876b3a8573.tar.bz2
scummvm-rg350-fa737fd5af3763a152e92c4b74c114876b3a8573.zip
Merge branch 'master' into tsage_r2r
Diffstat (limited to 'backends/timer/default')
-rw-r--r--backends/timer/default/default-timer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp
index 9f56d58b12..ce93320f3d 100644
--- a/backends/timer/default/default-timer.cpp
+++ b/backends/timer/default/default-timer.cpp
@@ -80,7 +80,7 @@ DefaultTimerManager::~DefaultTimerManager() {
void DefaultTimerManager::handler() {
Common::StackLock lock(_mutex);
- const uint32 curTime = g_system->getMillis();
+ uint32 curTime = g_system->getMillis(true);
// Repeat as long as there is a TimerSlot that is scheduled to fire.
TimerSlot *slot = _head->next;