X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands%2Fcmd_part.cpp;h=aadb42d901d62d39ebe02686e2bdf544a2fe0f6b;hb=0c78ad71d32e4062827f2ebac927bdbf43c091ba;hp=e2e4e59a02960542f0f444d914e9a3aab4c195bb;hpb=3841c4b04a96389a4661535d12d5215a621d8736;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/commands/cmd_part.cpp b/src/commands/cmd_part.cpp
index e2e4e59a0..aadb42d90 100644
--- a/src/commands/cmd_part.cpp
+++ b/src/commands/cmd_part.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /** Handle /PART. These command handlers can be reloaded by the core,
@@ -39,19 +46,15 @@ CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User
 
 	if (IS_LOCAL(user))
 	{
-		if (*ServerInstance->Config->FixedPart)
+		if (!ServerInstance->Config->FixedPart.empty())
 			reason = ServerInstance->Config->FixedPart;
-		else
-		{
-			if (parameters.size() > 1)
-				reason = ServerInstance->Config->PrefixPart + std::string(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))
@@ -61,9 +64,7 @@ CmdResult CommandPart::Handle (const std::vector<std::string>& parameters, User
 
 	if (c)
 	{
-		if (!c->PartUser(user, reason))
-			/* Arse, who stole our channel! :/ */
-			delete c;
+		c->PartUser(user, reason);
 	}
 	else
 	{