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/modules/m_globalload.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/modules/m_globalload.cpp')

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 9e0ec7705..aed65045f 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -151,7 +151,7 @@ class CommandGreloadmodule : public Command
 			if (m)
 			{
 				GReloadModuleWorker* worker = NULL;
-				if (m != creator)
+				if ((m != creator) && (!creator->dying))
 					worker = new GReloadModuleWorker(user->nick, user->uuid, parameters[0]);
 				ServerInstance->Modules->Reload(m, worker);
 			}
-- 
cgit v1.2.3