Change allocation of InspIRCd::Modes to be physically part of the object containing it using fakederef

2 files changed, 1 insertions, 5 deletions

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 6d072b0e5..8d0b8a649 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -125,7 +125,6 @@ void InspIRCd::Cleanup()
 	}
 	DeleteZero(this->FakeClient);
 	DeleteZero(this->Users);
-	DeleteZero(this->Modes);
 	DeleteZero(this->XLines);
 	DeleteZero(this->Modules);
 	DeleteZero(this->SNO);
@@ -257,7 +256,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	this->SNO = 0;
 	this->Modules = 0;
 	this->XLines = 0;
-	this->Modes = 0;
 	this->ConfigThread = NULL;
 	this->FakeClient = NULL;
 
@@ -397,8 +395,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	std::cout << "\tAttila" << con_reset << std::endl << std::endl;
 	std::cout << "Others:\t\t\t" << con_green << "See /INFO Output" << con_reset << std::endl;
 
-	this->Modes = new ModeParser;
-
 #ifndef _WIN32
 	if (!do_root)
 		this->CheckRoot();
diff --git a/src/mode.cpp b/src/mode.cpp
index 9d24160f6..3d2b8e5c4 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -35,7 +35,7 @@ ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modelett
 
 CullResult ModeHandler::cull()
 {
-	if (ServerInstance->Modes)
+	if (ServerInstance)
 		ServerInstance->Modes->DelMode(this);
 	return classbase::cull();
 }