inspircd

commit f9a258fa768362279cb5365856fe3f4dce5d6245
parent 0ab7720ea4b53996a4bb6b8e47e8aae9304861a1
Author: Peter Powell <petpow@saberuk.com>
Date:   Fri, 17 May 2019 09:23:46 +0100

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.

Diffstat:
M
src/xline.cpp
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git 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;
 			}
 		}
 	}