X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=event_neonserv_join.c;h=a117c18b0c7afa4145ea63a05c42c46a83864d6a;hb=795115bf680185ae01043bd1222b78bfed8c1d87;hp=6397e0bf0782eedc5636d2be9ae9477257ceb631;hpb=d4f8a26dc937cf699011e837502cb964e7b5827f;p=NeonServV5.git

diff --git a/event_neonserv_join.c b/event_neonserv_join.c
index 6397e0b..a117c18 100644
--- a/event_neonserv_join.c
+++ b/event_neonserv_join.c
@@ -28,7 +28,7 @@ static void neonserv_event_join(struct ChanUser *chanuser) {
         res = mysql_use();
         if ((row = mysql_fetch_row(res)) != NULL) {
             putsock(client, "MODE %s +b %s", chanuser->chan->name, ban);
-            putsock(client, "KICK %s %s :(%s) %s", chanuser->chan->name, chanuser->user->nick, row[1], row[0]);
+            putsock(client, "KICK %s %s :(%s) %s", chanuser->chan->name, chanuser->user->nick, (row[1] ? row[1] : client->user->nick), row[0]);
             return;
         }
     }
@@ -152,7 +152,7 @@ static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanU
         }
     }
     //AUTOINVITE
-    if(!strcmp(chanuserrow[3], "0") || time(0) - atol(chanuserrow[3]) >= 30) {
+    if(chanuserrow && !strcmp(chanuserrow[3], "0") && time(0) - atol(chanuserrow[3]) >= 30) {
         //TODO: autoinvite
     }
 }