diff options
author | Johannes Schickel | 2011-08-10 18:34:08 +0200 |
---|---|---|
committer | Johannes Schickel | 2011-08-10 18:34:08 +0200 |
commit | c443f113ed5729b88792d3b54b77d70033cb24dc (patch) | |
tree | 174425f5328d38f2b63e147354d252414573c8a6 /backends/timer | |
parent | cea06991ebab97c72e9fd89a4bf63835bcf0de80 (diff) | |
download | scummvm-rg350-c443f113ed5729b88792d3b54b77d70033cb24dc.tar.gz scummvm-rg350-c443f113ed5729b88792d3b54b77d70033cb24dc.tar.bz2 scummvm-rg350-c443f113ed5729b88792d3b54b77d70033cb24dc.zip |
TIMER: Remove all names associated with a callback, since all callbacks are removed.
This makes the name removal consistent with the timer proc removal.
It seems we only allow a specific timer proc being added once anymore though.
So this should not change too much right now.
Diffstat (limited to 'backends/timer')
-rw-r--r-- | backends/timer/default/default-timer.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp index 28524bf3b5..5b133660e0 100644 --- a/backends/timer/default/default-timer.cpp +++ b/backends/timer/default/default-timer.cpp @@ -163,9 +163,7 @@ void DefaultTimerManager::removeTimerProc(TimerProc callback) { } for (TimerSlotMap::iterator i = _callbacks.begin(), end = _callbacks.end(); i != end; ++i) { - if (i->_value == callback) { + if (i->_value == callback) _callbacks.erase(i); - break; - } } } |