From: attilamolnar <attilamolnar@hush.com>
Date: Fri, 16 Nov 2012 22:13:12 +0000 (+0100)
Subject: m_globalload Fix wrong error message being sent when the module given to /gunloadmodu... 
X-Git-Tag: v2.0.23~457
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=2de13e15c26edf4f4a5c0280974b2dea052c1853;p=user%2Fhenk%2Fcode%2Finspircd.git

m_globalload Fix wrong error message being sent when the module given to /gunloadmodule is not found
---

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 9a0074cb4..f10d7f465 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());