summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-02-10 15:05:00 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2007-02-10 15:05:00 +0000
commit8a15b719601bd886487775c9709ba16cf3e39096 (patch)
treea8604ce4ba1b6cdf4e0b0180c82f3a6b9c717598 /src
parent04e4d646ea2b779e098cd3546fdf56620b4f74a6 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/inspircd.cpp2
-rw-r--r--src/timer.cpp4
2 files changed, 3 insertions, 3 deletions
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);