Merge pull request #1269 from Adam-/insp20+saslhost

[user/henk/code/inspircd.git] / src / commands / cmd_reloadmodule.cpp

diff --git a/src/commands/cmd_reloadmodule.cpp b/src/commands/cmd_reloadmodule.cpp
index 81ecce1cbb85d27f9da166a436c933af32993cfe..eac364f0e6487ae64e520437a2988c211d5efc86 100644 (file)
--- a/src/commands/cmd_reloadmodule.cpp
+++ b/src/commands/cmd_reloadmodule.cpp
@@ -66,7 +66,7 @@ CmdResult CommandReloadmodule::Handle (const std::vector<std::string>& parameter
        Module* m = ServerInstance->Modules->Find(parameters[0]);
        if (m)
        {
-               ServerInstance->Modules->Reload(m, new ReloadModuleWorker(user->uuid, parameters[0]));
+               ServerInstance->Modules->Reload(m, (creator->dying ? NULL : new ReloadModuleWorker(user->uuid, parameters[0])));
                return CMD_SUCCESS;
        }
        else