Add duplicate UID error in ParseUID(), seems pippijn was triggering it and it was...

[user/henk/code/inspircd.git] / src / timer.cpp

diff --git a/src/timer.cpp b/src/timer.cpp
index e7635c52811d1f806ef2ee5cfdc9c18f756b1484..c041075025321e04fc5aa8cd8b2e20fb64a11fc3 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -14,7 +14,7 @@
 #include "inspircd.h"
 #include "timer.h"
 
-TimerManager::TimerManager() : CantDeleteHere(false)
+TimerManager::TimerManager(InspIRCd* Instance) : CantDeleteHere(false), ServerInstance(Instance)
 {
 }
 
@@ -87,6 +87,7 @@ void TimerManager::DelTimer(InspTimer* T)
                                if (!x->size())
                                {
                                        Timers.erase(found);
+                                       DELETE(x);
                                }
                                return;
                        }
@@ -103,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)
@@ -143,7 +116,7 @@ void TimerManager::AddTimer(InspTimer* T, long secs_from_now)
        if (!secs_from_now)
                time_to_trigger = T->GetTimer();
        else
-               time_to_trigger = secs_from_now + time(NULL);
+               time_to_trigger = secs_from_now + ServerInstance->Time();
 
        timerlist::iterator found = Timers.find(time_to_trigger);