From 8a15b719601bd886487775c9709ba16cf3e39096 Mon Sep 17 00:00:00 2001 From: brain Date: Sat, 10 Feb 2007 15:05:00 +0000 Subject: timermanager never had a ServerInstance. Give it one so we can use InspIRCd::Time() rather than time() git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6561 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/inspircd.cpp | 2 +- src/timer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 8f9bb4589..c7e261e3b 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -346,7 +346,7 @@ InspIRCd::InspIRCd(int argc, char** argv) this->OpenLog(argv, argc); this->stats = new serverstats(); - this->Timers = new TimerManager(); + this->Timers = new TimerManager(this); this->Parser = new CommandParser(this); this->XLines = new XLineManager(this); Config->ClearStack(); diff --git a/src/timer.cpp b/src/timer.cpp index 63c7b5874..c04107502 100644 --- 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) { } @@ -116,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); -- cgit v1.2.3