Merge branch 'master+ehdispatch'

[user/henk/code/inspircd.git] / src / coremods / core_reloadmodule.cpp

diff --git a/src/coremods/core_reloadmodule.cpp b/src/coremods/core_reloadmodule.cpp
index 765c465fde6dec30f97c30b6a10a2e9079fa660b..1561131dc71365ff43375530c8fc51bbd8db5e24 100644 (file)
--- a/src/coremods/core_reloadmodule.cpp
+++ b/src/coremods/core_reloadmodule.cpp
@@ -55,14 +55,14 @@ class ReloadModuleWorker : public HandlerBase1<void, bool>
 
 CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       if (parameters[0] == "cmd_reloadmodule.so")
+       Module* m = ServerInstance->Modules->Find(parameters[0]);
+       if (m == creator)
        {
-               user->WriteNumeric(RPL_LOADEDMODULE, "%s :You cannot reload cmd_reloadmodule.so (unload and load it)",
+               user->WriteNumeric(RPL_LOADEDMODULE, "%s :You cannot reload core_reloadmodule.so (unload and load it)",
                        parameters[0].c_str());
                return CMD_FAILURE;
        }
 
-       Module* m = ServerInstance->Modules->Find(parameters[0]);
        if (m)
        {
                ServerInstance->Modules->Reload(m, new ReloadModuleWorker(user->uuid, parameters[0]));