From: w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Tue, 24 Jul 2007 20:02:13 +0000 (+0000)
Subject: This is no longer the case, userrec::QuitUser is safe, so use it.
X-Git-Tag: v2.0.23~4892
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=88516c29b732d9a923c7fc5b7a77d096ebe45496;p=user%2Fhenk%2Fcode%2Finspircd.git

This is no longer the case, userrec::QuitUser is safe, so use it.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7554 e03df62e-2008-0410-955e-edbf42e46eb7
---

diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h
index 9c9a1238e..4f8690fe6 100644
--- a/src/modules/m_filter.h
+++ b/src/modules/m_filter.h
@@ -359,12 +359,8 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
 				/* Are they parting, if so, kill is applicable */
 				if ((parting) && (f->action == "kill"))
 				{
-					user->SetWriteError("Filtered: "+f->reason);
-					/* This WriteServ causes the write error to be applied.
-					 * Its not safe to kill here with QuitUser in a PreCommand handler,
-					 * so we do it this way, which is safe just about anywhere.
-					 */
 					user->WriteServ("NOTICE %s :*** Your PART message was filtered: %s", user->nick, f->reason.c_str());
+					userrec::QuitUser(ServerInstance, "Filtered: " + f->reason);
 				}
 				if (f->action == "gline")
 				{