Merge pull request #1162 from SaberUK/insp20+fix-deinstall

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

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index dab1143adc8567aaf103c2b1ba1c396d5ad7e100..050f41c758379e7581fea0054287a3532d885c7e 100644 (file)
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -36,7 +36,10 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 {
        /* Don't allow people to specify paths for modules, it doesn't work as expected */
        if (filename.find('/') != std::string::npos)
+       {
+               LastModuleError = "You can't load modules with a path: " + filename;
                return false;
+       }
 
        char modfile[MAXBUF];
        snprintf(modfile,MAXBUF,"%s/%s",ServerInstance->Config->ModPath.c_str(),filename.c_str());
@@ -66,6 +69,7 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
                {
                        newmod->ModuleSourceFile = filename;
                        newmod->ModuleDLLManager = newhandle;
+                       newmod->dying = false;
                        Modules[filename] = newmod;
                        std::string version = newhandle->GetVersion();
                        if (defer)
@@ -178,7 +182,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);
 }