X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=94dd41da0a0c21a5094d9c020f44cdfa0699eaf7;hb=e62516014fdbc13a0baf9b869b747300bfdccbc7;hp=b8192d3879f073bd2175f1783c19d2adb56710c8;hpb=771016b99723ae1b4924b85297817a7957563981;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index b8192d387..94dd41da0 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -135,8 +135,8 @@ void InspIRCd::Cleanup()
 
 	/* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */
 	/* Must be deleted before modes as it decrements modelines */
-	DeleteZero(this->Users);
 	DeleteZero(this->FakeClient);
+	DeleteZero(this->Users);
 	DeleteZero(this->Modes);
 	DeleteZero(this->XLines);
 	DeleteZero(this->Parser);
@@ -317,9 +317,7 @@ void InspIRCd::WritePID(const std::string &filename)
 	}
 }
 
-InspIRCd::InspIRCd(int argc, char** argv)
-	: GlobalCulls(this),
-
+InspIRCd::InspIRCd(int argc, char** argv) :
 	 /* Functor initialisation. Note that the ordering here is very important.
 	  *
 	  * THIS MUST MATCH ORDER OF DECLARATION OF THE HandleWhateverFunc classes
@@ -868,12 +866,9 @@ void InspIRCd::BufferedSocketCull()
  */
 bool InspIRCd::AllModulesReportReady(User* user)
 {
-	for (EventHandlerIter i = Modules->EventHandlers[I_OnCheckReady].begin(); i != Modules->EventHandlers[I_OnCheckReady].end(); ++i)
-	{
-		if (!(*i)->OnCheckReady(user))
-			return false;
-	}
-	return true;
+	ModResult res;
+	FIRST_MOD_RESULT(this, OnCheckReady, res, (user));
+	return (res == MOD_RES_PASSTHRU);
 }
 
 time_t InspIRCd::Time()