From f9a258fa768362279cb5365856fe3f4dce5d6245 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 17 May 2019 09:23:46 +0100 Subject: [PATCH] Only skip applying more X-lines to a user if they have been killed. This fixes an issue with the previous commit where if a user had a non-killing X-line applied to them (e.g. Q-line) they would not have any further X-lines applied to them. Thanks to @linuxdaemon for pointing this out. --- src/xline.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/xline.cpp b/src/xline.cpp index f9d94e447..accffb8d0 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -460,7 +460,11 @@ void XLineManager::ApplyLines() if (x->Matches(u)) { x->Apply(u); - break; + + // If applying the X-line has killed the user then don't + // apply any more lines to them. + if (u->quitting) + break; } } }