Merge pull request #452 from SaberUK/master+nuke-hashmap

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index a67d24a6dc986a4b89e189b2f6a17d043405da8e..68d1917c4ba3d949af1797e2fa812057410cda4a 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -321,11 +321,9 @@ InspIRCd::InspIRCd(int argc, char** argv) :
         OperQuit("OperQuit", NULL),
         GenRandom(&HandleGenRandom),
         IsChannel(&HandleIsChannel),
-        IsSID(&HandleIsSID),
         Rehash(&HandleRehash),
         IsNick(&HandleIsNick),
         IsIdent(&HandleIsIdent),
-        FloodQuitUser(&HandleFloodQuitUser),
         OnCheckExemption(&HandleOnCheckExemption)
 {
        ServerInstance = this;
@@ -789,7 +787,6 @@ int InspIRCd::Run()
                 */
                if (TIME.tv_sec != OLDTIME)
                {
-                       OLDTIME = TIME.tv_sec;
 #ifndef _WIN32
                        getrusage(RUSAGE_SELF, &ru);
                        stats->LastSampled = TIME;
@@ -816,6 +813,8 @@ int InspIRCd::Run()
                        {
                                SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)TIME.tv_sec - OLDTIME);
                        }
+\r
+                       OLDTIME = TIME.tv_sec;
 
                        if ((TIME.tv_sec % 3600) == 0)
                        {