From: Sadie Powell <sadie@witchery.services>
Date: Tue, 19 Jan 2021 07:19:48 +0000 (+0000)
Subject: Send ERR_CANTUNLOADMODULE when unloading a module on reload fails.
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=28fef58b882e34369c935d56cb4ac50429cba8c7;p=user%2Fhenk%2Fcode%2Finspircd.git

Send ERR_CANTUNLOADMODULE when unloading a module on reload fails.
---

diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp
index 98bf2ab40..34eaeae18 100644
--- a/src/coremods/core_reloadmodule.cpp
+++ b/src/coremods/core_reloadmodule.cpp
@@ -736,7 +736,10 @@ class ReloadAction : public ActionBase
 		ServerInstance->SNO->WriteGlobalSno('a', "RELOAD MODULE: %s %ssuccessfully reloaded", passedname.c_str(), result ? "" : "un");
 		User* user = ServerInstance->FindUUID(uuid);
 		if (user)
-			user->WriteNumeric(RPL_LOADEDMODULE, passedname, InspIRCd::Format("Module %ssuccessfully reloaded.", (result ? "" : "un")));
+		{
+			int numeric = result ? RPL_LOADEDMODULE : ERR_CANTUNLOADMODULE;
+			user->WriteNumeric(numeric, passedname, InspIRCd::Format("Module %ssuccessfully reloaded.", (result ? "" : "un")));
+		}
 
 		ServerInstance->GlobalCulls.AddItem(this);
 	}
@@ -747,7 +750,7 @@ CmdResult CommandReloadmodule::Handle(User* user, const Params& parameters)
 	Module* m = ServerInstance->Modules->Find(parameters[0]);
 	if (m == creator)
 	{
-		user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "You cannot reload core_reloadmodule (unload and load it)");
+		user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "You cannot reload core_reloadmodule (unload and load it)");
 		return CMD_FAILURE;
 	}
 
@@ -761,7 +764,7 @@ CmdResult CommandReloadmodule::Handle(User* user, const Params& parameters)
 	}
 	else
 	{
-		user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Could not find module by that name");
+		user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "Could not find module by that name");
 		return CMD_FAILURE;
 	}
 }
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index f1961f6b4..15c41502f 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -143,7 +143,7 @@ class CommandGReloadModule : public Command
 			}
 			else
 			{
-				user->WriteRemoteNumeric(RPL_LOADEDMODULE, parameters[0], "Could not find module by that name");
+				user->WriteRemoteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "Could not find module by that name");
 				return CMD_FAILURE;
 			}
 		}