Allow Timers to delete themselves in Tick()

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

diff --git a/src/timer.cpp b/src/timer.cpp
index f541c7eb17f69ab2a96b395c6271a65bffb8519d..b897056e68919bdc846713107be09c3a758c69cc 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -47,8 +47,9 @@ void TimerManager::TickTimers(time_t TIME)
                Timers.erase(i++);
 
                if (!t->Tick(TIME))
-                       delete t;
-               else if (t->GetRepeat())
+                       continue;
+
+               if (t->GetRepeat())
                {
                        t->SetTrigger(TIME + t->GetInterval());
                        AddTimer(t);