Allow opermotd to specify its file in <files> without also requiring an <opermotd...

[user/henk/code/inspircd.git] / src / modmanager_dynamic.cpp

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index 9005622603f8d45df04ce87677814f5efe25021c..0c63eefcd0cab6f918f8042387bcbf9b354ac86c 100644 (file)
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -88,12 +88,12 @@ bool ModuleManager::Load(const char* filename)
                {
                        newmod->ModuleSourceFile = filename_str;
                        newmod->ModuleDLLManager = newhandle;
-                       Version v = newmod->GetVersion();
+                       Modules[filename_str] = newmod;
+                       newmod->init();
 
+                       Version v = newmod->GetVersion();
                        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 +106,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();