More WriteGlobalSno conversions in rehash, patch by dKingston

[user/henk/code/inspircd.git] / src / commands / cmd_rehash.cpp

diff --git a/src/commands/cmd_rehash.cpp b/src/commands/cmd_rehash.cpp
index a689801aa51d852cdcb7e4837052ff6816d9ce94..5d5caa32abd216d6ad1f59b550066a844a747764 100644 (file)
--- a/src/commands/cmd_rehash.cpp
+++ b/src/commands/cmd_rehash.cpp
@@ -67,15 +67,15 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use
        // Rehash for me. Try to start the rehash thread
        if (!ServerInstance->ConfigThread)
        {
-               std::string m = user->nick + " is rehashing config file " + ServerConfig::CleanFilename(ServerInstance->ConfigFileName) + " on " + ServerInstance->Config->ServerName;
+               std::string m = user->nick + " is rehashing config file " + ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()) + " on " + ServerInstance->Config->ServerName;
                ServerInstance->SNO->WriteGlobalSno('a', m);
 
                if (IS_LOCAL(user))
                        user->WriteNumeric(RPL_REHASHING, "%s %s :Rehashing",
-                               user->nick.c_str(),ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
+                               user->nick.c_str(),ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()));
                else
                        ServerInstance->PI->SendUserNotice(user, std::string("*** Rehashing server ") +
-                               ServerConfig::CleanFilename(ServerInstance->ConfigFileName));
+                               ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()));
 
                /* Don't do anything with the logs here -- logs are restarted
                 * after the config thread has completed.
@@ -85,7 +85,7 @@ CmdResult CommandRehash::Handle (const std::vector<std::string>& parameters, Use
                FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
 
 
-               ServerInstance->ConfigThread = new ConfigReaderThread(ServerInstance, user->uuid);
+               ServerInstance->ConfigThread = new ConfigReaderThread(user->uuid);
                ServerInstance->Threads->Start(ServerInstance->ConfigThread);
 
                return CMD_SUCCESS;