Wheeeeee

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 47c47dbeb61a09d6d70d2c478636809b261b8db5..765ee71fdaad6ba585c41e14d213e0890ebb9991 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -499,10 +499,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
         * For an explanation as to exactly how this works, and why it works this way, see GetUID().
         *   -- w00t
         */
-       if (*Config->sid)
-       {
-       }
-       else
+       if (!*Config->sid)
        {
                // Generate one
                size_t sid = 0;
@@ -647,6 +644,7 @@ int InspIRCd::Run()
                         * until the other thread is completed.
                         */
                        delete ConfigThread;
+                       ConfigThread = NULL;
 
                        /* These are currently not known to be threadsafe, so they are executed outside
                         * of the thread. It would be pretty simple to move them to the thread Run method
@@ -679,7 +677,7 @@ int InspIRCd::Run()
                {
                        if (TIME < OLDTIME)
                        {
-                               SNO->WriteToSnoMask('A', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
+                               SNO->WriteToSnoMask('A', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",OLDTIME-TIME);
                        }
 
                        if ((TIME % 3600) == 0)
@@ -768,11 +766,9 @@ bool InspIRCd::AllModulesReportReady(User* user)
 {
        for (EventHandlerIter i = Modules->EventHandlers[I_OnCheckReady].begin(); i != Modules->EventHandlers[I_OnCheckReady].end(); ++i)
        {
-               int res = (*i)->OnCheckReady(user);
-               if (!res)
+               if (!(*i)->OnCheckReady(user))
                        return false;
        }
-
        return true;
 }