X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globalload.cpp;h=22286b950e9dead2a72f93873b440a7be4b91f4c;hb=9cdf47629faeec64edc77ff0729dc55946ed753c;hp=9a0074cb40164b50e2f1cc95aeb01a721d70be2c;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 9a0074cb4..22286b950 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -84,16 +84,21 @@ class CommandGunloadmodule : public Command
 		if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
 		{
 			Module* m = ServerInstance->Modules->Find(parameters[0]);
-			if (m && ServerInstance->Modules->Unload(m))
+			if (m)
 			{
-				ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
-				user->SendText(":%s 973 %s %s :Module successfully unloaded.",
-					ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
+				if (ServerInstance->Modules->Unload(m))
+				{
+					ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
+					user->SendText(":%s 973 %s %s :Module successfully unloaded.",
+						ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
+				}
+				else
+				{
+					user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+				}
 			}
 			else
-			{
-				user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
-			}
+				user->SendText(":%s 972 %s %s :No such module", ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
 		}
 		else
 			ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str());
@@ -173,9 +178,13 @@ class ModuleGlobalLoad : public Module
 	ModuleGlobalLoad()
 		: cmd1(this), cmd2(this), cmd3(this)
 	{
-		ServerInstance->AddCommand(&cmd1);
-		ServerInstance->AddCommand(&cmd2);
-		ServerInstance->AddCommand(&cmd3);
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(cmd1);
+		ServerInstance->Modules->AddService(cmd2);
+		ServerInstance->Modules->AddService(cmd3);
 	}
 
 	~ModuleGlobalLoad()