From c5f19db85c2a2669884eb8ac72362c86afb65617 Mon Sep 17 00:00:00 2001
From: Attila Molnar <attilamolnar@hush.com>
Date: Sun, 30 Nov 2014 18:24:17 +0100
Subject: Don't submit a reload worker if the module doing the reload is
 scheduled for unload

---
 src/commands/cmd_reloadmodule.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/commands/cmd_reloadmodule.cpp')

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
-- 
cgit v1.2.3