Merge branch 'master+tlsversion'

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

diff --git a/src/timer.cpp b/src/timer.cpp
index 4fee7174222340ee7604bd817f0780f3540c5a3b..0b0d8bac3664d93add0cffa572fc5666ba161403 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -30,8 +30,8 @@ void Timer::SetInterval(time_t newinterval)
        ServerInstance->Timers.AddTimer(this);
 }
 
-Timer::Timer(unsigned int secs_from_now, time_t now, bool repeating)
-       : trigger(now + secs_from_now)
+Timer::Timer(unsigned int secs_from_now, bool repeating)
+       : trigger(ServerInstance->Time() + secs_from_now)
        , secs(secs_from_now)
        , repeat(repeating)
 {