Merge pull request #1018 from SaberUK/insp20+hidekills

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

diff --git a/src/commands/cmd_part.cpp b/src/commands/cmd_part.cpp
index 32cc267577465ff14321c811e3f83008b9046cda..aadb42d901d62d39ebe02686e2bdf544a2fe0f6b 100644 (file)
--- a/src/commands/cmd_part.cpp
+++ b/src/commands/cmd_part.cpp
@@ -48,17 +48,13 @@ CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User
        {
                if (!ServerInstance->Config->FixedPart.empty())
                        reason = ServerInstance->Config->FixedPart;
-               else
-               {
-                       if (parameters.size() > 1)
-                               reason = ServerInstance->Config->PrefixPart + parameters[1] + ServerInstance->Config->SuffixPart;
-                       else
-                               reason = "";
-               }
+               else if (parameters.size() > 1)
+                       reason = ServerInstance->Config->PrefixPart + parameters[1] + ServerInstance->Config->SuffixPart;
        }
        else
        {
-               reason = parameters.size() > 1 ? parameters[1] : "";
+               if (parameters.size() > 1)
+                       reason = parameters[1];
        }
 
        if (ServerInstance->Parser->LoopCall(user, this, parameters, 0))