X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodmanager_static.cpp;h=cea40c7a32364e75a807866f7979e6730c88a40c;hb=fc4fc43ec232407b38d7ca182cb92c5cac4287aa;hp=d2a2f2c098491b760f6c64f14e6cb20f9cbf1297;hpb=08a566b5d7f4a9c1bafd4bf74d2a05ed8010d6b6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index d2a2f2c09..cea40c7a3 100644
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -93,6 +93,7 @@ bool ModuleManager::Load(const std::string& name, bool defer)
 		mod = (*it->second->init)();
 		mod->ModuleSourceFile = name;
 		mod->ModuleDLLManager = NULL;
+		mod->dying = false;
 		Modules[name] = mod;
 		if (defer)
 		{
@@ -157,7 +158,8 @@ namespace {
 			ServerInstance->Modules->DoSafeUnload(mod);
 			ServerInstance->GlobalCulls.Apply();
 			bool rv = ServerInstance->Modules->Load(name.c_str());
-			callback->Call(rv);
+			if (callback)
+				callback->Call(rv);
 			ServerInstance->GlobalCulls.AddItem(this);
 		}
 	};
@@ -175,7 +177,7 @@ void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
 {
 	if (CanUnload(mod))
 		ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
-	else
+	else if (callback)
 		callback->Call(false);
 }