Remove unnecessary string copies and dead code

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

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index b105eea924a23ff478a30e9bfcb7520c96469e11..8f532ee80c9b0077a9d49b3e009af95238f63b39 100644 (file)
--- 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)
                {
@@ -183,6 +184,7 @@ void ModuleManager::LoadAll()
 {
        Load("cmd_all", true);
        Load("cmd_whowas.so", true);
+       Load("cmd_lusers.so", true);
 
        ConfigTagList tags = ServerInstance->Config->ConfTags("module");
        for(ConfigIter i = tags.first; i != tags.second; ++i)
@@ -194,7 +196,7 @@ void ModuleManager::LoadAll()
                if (!this->Load(name, true))
                {
                        ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError());
-                       std::cout << std::endl << "[" << con_red << "*" << con_reset << "]" << this->LastError() << std::endl << std::endl;
+                       std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << this->LastError() << std::endl << std::endl;
                        ServerInstance->Exit(EXIT_STATUS_MODULE);
                }
        }
@@ -210,7 +212,7 @@ void ModuleManager::LoadAll()
                {
                        LastModuleError = "Unable to initialize " + mod->ModuleSourceFile + ": " + modexcept.GetReason();
                        ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
-                       std::cout << std::endl << "[" << con_red << "*" << con_reset << "]" << LastModuleError << std::endl << std::endl;
+                       std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << LastModuleError << std::endl << std::endl;
                        ServerInstance->Exit(EXIT_STATUS_MODULE);
                }
        }