Fix build error

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

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index d30f9f5954ae4911d24c16e55a6cc44189e82704..fa6b119a025234bd9b7feaade560663aebae3196 100644 (file)
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -110,8 +110,8 @@ bool ModuleManager::Load(const char* filename)
                // failure in module constructor
                if (newmod)
                        DoSafeUnload(newmod);
-               delete newmod;
-               delete newhandle;
+               else
+                       delete newhandle;
                LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason();
                ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                return false;
@@ -169,7 +169,8 @@ namespace {
                        ServerInstance->GlobalCulls.Apply();
                        delete dll;
                        bool rv = ServerInstance->Modules->Load(name.c_str());
-                       callback->Call(rv);
+                       if (callback)
+                               callback->Call(rv);
                        ServerInstance->GlobalCulls.AddItem(this);
                }
        };