X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodmanager_dynamic.cpp;h=1fcf3aa566b2f246288a45e5a768a57e8467ccd6;hb=235864add961270140c956647d783fa79b5f7120;hp=9005622603f8d45df04ce87677814f5efe25021c;hpb=88b9ecb6b34d268f0761e6e961408871b6e91376;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index 900562260..1fcf3aa56 100644
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -89,11 +89,12 @@ bool ModuleManager::Load(const char* filename)
 			newmod->ModuleSourceFile = filename_str;
 			newmod->ModuleDLLManager = newhandle;
 			Version v = newmod->GetVersion();
+			Modules[filename_str] = newmod;
+
+			newmod->init();
 
 			ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)%s",
 				filename, newhandle->GetVersion().c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
-
-			Modules[filename_str] = newmod;
 		}
 		else
 		{
@@ -106,6 +107,8 @@ bool ModuleManager::Load(const char* filename)
 	catch (CoreException& modexcept)
 	{
 		// failure in module constructor
+		if (newmod)
+			DoSafeUnload(newmod);
 		delete newmod;
 		delete newhandle;
 		LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason();