Improve UserManager::QuitUser() and related code

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

diff --git a/src/commands/cmd_quit.cpp b/src/commands/cmd_quit.cpp
index 61a88e2b55f53e73650f462025394d3445935665..144f4675b31a090f1f23bd79a5fb0d8743d99074 100644 (file)
--- a/src/commands/cmd_quit.cpp
+++ b/src/commands/cmd_quit.cpp
@@ -56,21 +56,14 @@ CmdResult CommandQuit::Handle (const std::vector<std::string>& parameters, User
                        quitmsg = ServerInstance->Config->FixedQuit;
                else
                        quitmsg = parameters.size() ?
-                               ServerInstance->Config->PrefixQuit + std::string(parameters[0]) + ServerInstance->Config->SuffixQuit
+                               ServerInstance->Config->PrefixQuit + parameters[0] + ServerInstance->Config->SuffixQuit
                                : "Client exited";
        }
        else
                quitmsg = parameters.size() ? parameters[0] : "Client exited";
 
        std::string* operquit = ServerInstance->OperQuit.get(user);
-       if (operquit)
-       {
-               ServerInstance->Users->QuitUser(user, quitmsg, operquit->c_str());
-       }
-       else
-       {
-               ServerInstance->Users->QuitUser(user, quitmsg);
-       }
+       ServerInstance->Users->QuitUser(user, quitmsg, operquit);
 
        return CMD_SUCCESS;
 }