Roadmap item "Fix jointhrottle to not try 'throttle' clients during a netmerge (requi...

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index f1fedfe96041d8e6b0209d9c444a9a97f9ce2408..115a22eabd032d41c9048bc8d742c3630d8565e2 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -664,14 +664,10 @@ bool DoneULine(ServerConfig*, const char*)
  */
 bool InitModule(ServerConfig* conf, const char*)
 {
-       old_module_names.clear();
+       old_module_names = conf->GetInstance()->Modules->GetAllModuleNames(0);
        new_module_names.clear();
        added_modules.clear();
        removed_modules.clear();
-       for (std::vector<std::string>::iterator t = conf->module_names.begin(); t != conf->module_names.end(); t++)
-       {
-               old_module_names.push_back(*t);
-       }
        return true;
 }
 
@@ -1186,7 +1182,7 @@ void ServerConfig::Read(bool bail, User* user)
                                else
                                {
                                        if (user)
-                                               user->WriteServ("972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->Modules->LastError());
+                                               user->WriteServ("972 %s %s :%s",user->nick, removing->c_str(), ServerInstance->Modules->LastError().c_str());
                                }
                        }
                }
@@ -1207,7 +1203,7 @@ void ServerConfig::Read(bool bail, User* user)
                                else
                                {
                                        if (user)
-                                               user->WriteServ("974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->Modules->LastError());
+                                               user->WriteServ("974 %s %s :%s",user->nick, adding->c_str(), ServerInstance->Modules->LastError().c_str());
                                }
                        }
                }