X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FIRCParser.c;h=d1189bb7adaca0569fd05f910ba489fa03654452;hb=7eb4e8a89a9eed4ded46de4d0d2093c81279da8c;hp=e96063e54ff0219aebcf469f8604c4d1f38e31fd;hpb=4306aa8c968230fb5bf6d93f84b6a85a55f2e07b;p=NeonServV5.git

diff --git a/src/IRCParser.c b/src/IRCParser.c
index e96063e..d1189bb 100644
--- a/src/IRCParser.c
+++ b/src/IRCParser.c
@@ -171,7 +171,7 @@ static IRC_CMD(raw_join) {
     struct UserNode *user = getUserByMask(from);
     struct ChanNode *chan = getChanByName(argv[0]);
     if(!chan && !(user->flags & USERFLAG_ISBOT)) return 0;
-    if(chan && ((!isBot(user) && chan->chanbot != client->user) || (isBot(user) && client->user != user))) return 1; //we ignore it - but it's not a parse error
+    if(chan && (((!user || !isBot(user)) && chan->chanbot != client->user) || ((user && isBot(user)) && client->user != user))) return 1; //we ignore it - but it's not a parse error
     //let Bots always add themselves! (maybe they join invisible)
     if(user == NULL) {
         user = addUserMask(from);