From: Peter Powell <petpow@saberuk.com>
Date: Fri, 17 May 2019 08:23:46 +0000 (+0100)
Subject: Only skip applying more X-lines to a user if they have been killed.
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=f9a258fa768362279cb5365856fe3f4dce5d6245;p=user%2Fhenk%2Fcode%2Finspircd.git

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.
---

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;
 			}
 		}
 	}