Move initialization that throws configuration exceptions to init()

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12279 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 6 insertions, 7 deletions

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index cacc206d6..176a0e613 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -212,19 +212,18 @@ class ModuleOjoin : public Module
 	ModuleOjoin()
 		: np(NULL), mycommand(this)
 	{
+	}
+
+	void init()
+	{
 		/* Load config stuff */
 		OnRehash(NULL);
 
 		/* Initialise module variables */
 		np = new NetworkPrefix(this);
 
-		if (!ServerInstance->Modes->AddMode(np))
-		{
-			delete np;
-			throw ModuleException("Could not add new mode!");
-		}
-
-		ServerInstance->AddCommand(&mycommand);
+		ServerInstance->Modules->AddService(*np);
+		ServerInstance->Modules->AddService(mycommand);
 
 		Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserPreKick, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 3);