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

iterator fix

Browse source
This commit is contained in:
fluxgen 2002-05-23 09:48:22 +00:00
parent ea4c11a52e
commit b839dcaf1e
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Timer.cc
View file

@ -128,22 +128,24 @@ void BTimer::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.end(); ++it) { for(; it != m_timerlist.end(); ++it) {
tm.tv_sec = (*it)->getStartTime().tv_sec + //This is to make sure we don't get an invalid iterator
(*it)->getTimeout().tv_sec; //when we do fireTimeout
tm.tv_usec = (*it)->getStartTime().tv_usec + BTimer &t = *(*it);
(*it)->getTimeout().tv_usec; tm.tv_sec = t.getStartTime().tv_sec +
t.getTimeout().tv_sec;
tm.tv_usec = t.getStartTime().tv_usec +
t.getTimeout().tv_usec;
if ((now.tv_sec < tm.tv_sec) || if ((now.tv_sec < tm.tv_sec) ||
(now.tv_sec == tm.tv_sec && now.tv_usec < tm.tv_usec)) (now.tv_sec == tm.tv_sec && now.tv_usec < tm.tv_usec))
break; break;
(*it)->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 (! (*it)->doOnce()) if (! t.doOnce())
(*it)->start(); t.start();
else { else {
(*it)->stop(); t.stop();
it--; it--;
} }
} }