X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=a922543a38ced7ab71137d8c1ef145e6fabcb35d;hb=ac76c832925b786e188fc2c45da5fb7ae5128df3;hp=1ac075557d1ec4703d5ccba64407a1addf1a6baf;hpb=7f878af39e659176677913890e143a247add7bdc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 1ac075557..a922543a3 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -69,13 +69,14 @@ bool ServerConfig::ApplyDisabledCommands(const std::string& data)
 	std::string thiscmd;
 
 	/* Enable everything first */
-	for (Commandtable::iterator x = ServerInstance->Parser->cmdlist.begin(); x != ServerInstance->Parser->cmdlist.end(); x++)
+	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);
 	}
@@ -782,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();