X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=8e11ee4a7448442d23ba01e935592cba096aa9f2;hb=9ca7437e8faa192d26e1170e5825318ea0088be2;hp=f541c7eb17f69ab2a96b395c6271a65bffb8519d;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/timer.cpp b/src/timer.cpp
index f541c7eb1..8e11ee4a7 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -25,15 +25,15 @@
 
 void Timer::SetInterval(time_t newinterval)
 {
-	ServerInstance->Timers->DelTimer(this);
+	ServerInstance->Timers.DelTimer(this);
 	secs = newinterval;
 	SetTrigger(ServerInstance->Time() + newinterval);
-	ServerInstance->Timers->AddTimer(this);
+	ServerInstance->Timers.AddTimer(this);
 }
 
 Timer::~Timer()
 {
-	ServerInstance->Timers->DelTimer(this);
+	ServerInstance->Timers.DelTimer(this);
 }
 
 void TimerManager::TickTimers(time_t TIME)
@@ -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);