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

diff --git a/src/timer.cpp b/src/timer.cpp
index f541c7eb1..c499b7991 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -1,10 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2017 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2006-2007, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -21,19 +25,25 @@
 
 
 #include "inspircd.h"
-#include "timer.h"
 
-void Timer::SetInterval(time_t newinterval)
+void Timer::SetInterval(unsigned int 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(unsigned int secs_from_now, bool repeating)
+	: trigger(ServerInstance->Time() + secs_from_now)
+	, secs(secs_from_now)
+	, repeat(repeating)
+{
 }
 
 Timer::~Timer()
 {
-	ServerInstance->Timers->DelTimer(this);
+	ServerInstance->Timers.DelTimer(this);
 }
 
 void TimerManager::TickTimers(time_t TIME)
@@ -47,8 +57,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);