aboutsummaryrefslogtreecommitdiff
path: root/backends/timer/default
diff options
context:
space:
mode:
authorNorbert Lange2009-08-24 17:51:47 +0000
committerNorbert Lange2009-08-24 17:51:47 +0000
commit917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5 (patch)
treee652563203a00f8acecfaafbf93c64dbfbd13f25 /backends/timer/default
parent5f87d5090cfcb34cda3c1f5d430e0865344d7366 (diff)
parentdd7868acc2512c9761d892e67a4837f4dc38bdc0 (diff)
downloadscummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.tar.gz
scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.tar.bz2
scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.zip
Merge with trunk
svn-id: r43701
Diffstat (limited to 'backends/timer/default')
-rw-r--r--backends/timer/default/default-timer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp
index bd2222bbbc..dd468bbe09 100644
--- a/backends/timer/default/default-timer.cpp
+++ b/backends/timer/default/default-timer.cpp
@@ -124,6 +124,12 @@ bool DefaultTimerManager::installTimerProc(TimerProc callback, int32 interval, v
slot->nextFireTimeMicro = interval % 1000;
slot->next = 0;
+ // FIXME: It seems we do allow the client to add one callback multiple times over here,
+ // but "removeTimerProc" will remove *all* added instances. We should either prevent
+ // multiple additions of a timer proc OR we should change removeTimerProc to only remove
+ // a specific timer proc entry.
+ // Probably we can safely just allow a single addition of a specific function once
+ // and just update our Timer documentation accordingly.
insertPrioQueue(_head, slot);
return true;