Remove dup code by calling TickTimers in a loop

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6560 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/timer.cpp b/src/timer.cpp
index ab0e9456c75f24f9001a27094e7ed496f567cf95..63c7b58747b793f01b98dde036bc2c05066913e8 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -104,36 +104,8 @@ void TimerManager::DelTimer(InspTimer* T)
  */
 void TimerManager::TickMissedTimers(time_t TIME)
 {
-       /** See comment above in TickTimers
-        */
-       this->CantDeleteHere = true;
-
        for (time_t n = TIME-1; n > TIME-120; n--)
-       {
-               timerlist::iterator found = Timers.find(n);
-               if (found != Timers.end())
-               {
-                       timergroup* x = found->second;
-                       for (timergroup::iterator y = x->begin(); y != x->end(); y++)
-                       {
-                               InspTimer* z = *y;
-                               z->Tick(TIME);
-                               if (z->GetRepeat())
-                               {
-                                       AddTimer(z, z->GetSecs());
-                               }
-                               else
-                               {
-                                       DELETE(z);
-                               }
-                       }
-
-                       Timers.erase(found);
-                       DELETE(x);
-               }
-       }
-
-       this->CantDeleteHere = false;
+               this->TickTimers(TIME);
 }
 
 void TimerManager::AddTimer(InspTimer* T, long secs_from_now)