nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

accepted patch #1057446, improved iterator in timer-code

Browse source
This commit is contained in:
akir 2004-11-01 02:43:07 +00:00
parent fa1692180e
commit fa5202c120
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/FbTk/Timer.cc
View file

@ -163,7 +163,7 @@ void Timer::updateTimers(int fd) {
//must check end ...the timer might remove //must check end ...the timer might remove
//it self from the list (should be fixed in the future) //it self from the list (should be fixed in the future)
for(it = m_timerlist.begin(); it != m_timerlist.end(); ++it) { for(it = m_timerlist.begin(); it != m_timerlist.end(); ) {
//This is to make sure we don't get an invalid iterator //This is to make sure we don't get an invalid iterator
//when we do fireTimeout //when we do fireTimeout
Timer &t = *(*it); Timer &t = *(*it);
@ -178,12 +178,21 @@ void Timer::updateTimers(int fd) {
t.fireTimeout(); t.fireTimeout();
// restart the current timer so that the start time is updated // restart the current timer so that the start time is updated
if (! t.doOnce()) if (! t.doOnce()) {
t.start(); t.start();
else {
t.stop(); // Note that this mustn't be done if we're deleting the
it--; // entry from the list, so therefore it's not in the update
} // section of the for loop
it++;
} else {
// Since the default stop behaviour results in the timer
// being removed, we must remove it here, so that the iterator
// lives well. Another option would be to add it to another
// list, and then just go through that list and stop them all.
it = m_timerlist.erase(it);
t.stop();
}
} }
last_time = time(0); last_time = time(0);