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 f9d94e447b06d7aa24e2618c61e84ae5f3a02ee3..accffb8d0ebaf7ba0181f69b506ed3f2c2f59b86 100644 (file)
--- 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;
                        }
                }
        }