summaryrefslogtreecommitdiff
path: root/src/commands
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-11-30 18:24:17 +0100
committerAttila Molnar <attilamolnar@hush.com>2014-11-30 18:24:17 +0100
commitc5f19db85c2a2669884eb8ac72362c86afb65617 (patch)
tree4ef7ca1843481a076d7f92317270a57bde4d8996 /src/commands
parenta2f23523cff4dcc7dfac60781027fc90074c1ebd (diff)
Don't submit a reload worker if the module doing the reload is scheduled for unload
Diffstat (limited to 'src/commands')
-rw-r--r--src/commands/cmd_reloadmodule.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/commands/cmd_reloadmodule.cpp b/src/commands/cmd_reloadmodule.cpp
index 81ecce1cb..eac364f0e 100644
--- 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