X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=99da0070810b1f6b4463977e58c078c436b651d4;hb=0cfe4a848b06d8b8b277a7afc90ceabcaa50d9fa;hp=6e3bc5e04e4cbe6f21dcbb4104ed9af9e581c588;hpb=a71f34e4b17420cacc4a50c5af64fe15811a8148;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index 6e3bc5e04..99da00708 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -405,23 +405,25 @@ ModResult Channel::GetExtBanStatus(User *user, char type)
  * Remove a channel from a users record, remove the reference to the Membership object
  * from the channel and destroy it.
  */
-void Channel::PartUser(User *user, std::string &reason)
+bool Channel::PartUser(User* user, std::string& reason)
 {
 	MemberMap::iterator membiter = userlist.find(user);
 
-	if (membiter != userlist.end())
-	{
-		Membership* memb = membiter->second;
-		CUList except_list;
-		FOREACH_MOD(OnUserPart, (memb, reason, except_list));
+	if (membiter == userlist.end())
+		return false;
 
-		WriteAllExcept(user, false, 0, except_list, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
+	Membership* memb = membiter->second;
+	CUList except_list;
+	FOREACH_MOD(OnUserPart, (memb, reason, except_list));
 
-		// Remove this channel from the user's chanlist
-		user->chans.erase(memb);
-		// Remove the Membership from this channel's userlist and destroy it
-		this->DelUser(membiter);
-	}
+	WriteAllExcept(user, false, 0, except_list, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
+
+	// Remove this channel from the user's chanlist
+	user->chans.erase(memb);
+	// Remove the Membership from this channel's userlist and destroy it
+	this->DelUser(membiter);
+
+	return true;
 }
 
 void Channel::KickUser(User* src, const MemberMap::iterator& victimiter, const std::string& reason)