m_spanningtree Mark servers awaiting destruction after being lost in a netsplit,...

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 945600e6c06f14eb4eb7f1b1aa1b13d4030a89cc..a922543a38ced7ab71137d8c1ef145e6fabcb35d 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -69,14 +69,14 @@ bool ServerConfig::ApplyDisabledCommands(const std::string& data)
        std::string thiscmd;
 
        /* Enable everything first */
-       const CommandParser::CommandMap& commands = ServerInstance->Parser->GetCommands();
+       const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands();
        for (CommandParser::CommandMap::const_iterator x = commands.begin(); x != commands.end(); ++x)
                x->second->Disable(false);
 
        /* Now disable all the ones which the user wants disabled */
        while (dcmds >> thiscmd)
        {
-               Command* handler = ServerInstance->Parser->GetHandler(thiscmd);
+               Command* handler = ServerInstance->Parser.GetHandler(thiscmd);
                if (handler)
                        handler->Disable(true);
        }
@@ -783,6 +783,9 @@ void ConfigReaderThread::Finish()
                for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i)
                        i->second->ReadConfig(status);
 
+               // The description of this server may have changed - update it for WHOIS etc.
+               ServerInstance->FakeClient->server->description = Config->ServerDesc;
+
                ServerInstance->ISupport.Build();
 
                ServerInstance->Logs->CloseLogs();