Fixed a crash with net rider kicks.

diff --git a/ChangeLog b/ChangeLog
index f41fe8585de8719cbec73698c8a0fb9e847a167d..78a3286e97437597a9e57f1c70e04f848afbdb35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 /***********************************************************************
 X3 ChangeLog
 
+2009-12-17  Neil Spierling  <sirvulcan@sirvulcan.co.nz>
+
+       * src/mod-track.c: Fixed a crash with net rider kicks.
+
 2009-12-12  Alex Schumann  <rubin@afternet.org>
 
        src/x3ldap.c: Fix crash bug with ldap adding users. Deal with some warnings.

diff --git a/src/mod-track.c b/src/mod-track.c
index 92bcbe74d559c7a9f1dd21276756dddfb6380978..d88d143b7e5f50a143bc3c92c348f8bd2cc8963e 100644 (file)
--- a/src/mod-track.c
+++ b/src/mod-track.c
@@ -236,8 +236,14 @@ track_part(struct modeNode *mn, const char *reason, UNUSED_ARG(void *extra)) {
 static void
 track_kick(struct userNode *kicker, struct userNode *victim, struct chanNode *chan, UNUSED_ARG(void *extra)) {
     if (!track_cfg.enabled) return;
-    if (check_track_kick(track_cfg) && ((check_track_user(kicker->nick) || check_track_user(victim->nick))))
+    if (check_track_kick(track_cfg) && check_track_user(victim->nick))
     {
+           if (kicker) /* net rider kicks dont have a kicker set */
+           {
+               if (!check_track_user(kicker->nick))
+                   return;
+           }
+
            UPDATE_TIMESTAMP();
            TRACK("$bKICK$b %s from %s by %s", victim->nick, chan->name, (kicker ? kicker->nick : "some server"));
     }