X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=765ee71fdaad6ba585c41e14d213e0890ebb9991;hb=f8e07df6d6fe0250044929f3c200f2f2666d8f5c;hp=47c47dbeb61a09d6d70d2c478636809b261b8db5;hpb=e83461d2e2e359d5ebbd7d6e553bb994a8e6524d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 47c47dbeb..765ee71fd 100644
--- 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;
 }