X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2FWHOHandler.c;h=ab1b0c0251d862d9b3c3cb8b0eb951952b4d1d6d;hb=70f9fe3245bcfe95706e68142db3527425319191;hp=f7287a3cf367a48cad2f0543f0b22d1b342d72a1;hpb=ca7f64297d907421b6a1735647db0856fd93908a;p=NeonServV5.git

diff --git a/src/WHOHandler.c b/src/WHOHandler.c
index f7287a3..ab1b0c0 100644
--- a/src/WHOHandler.c
+++ b/src/WHOHandler.c
@@ -224,7 +224,7 @@ void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int
         
         struct UserNode *user = getUserByNick(argv[4]);
         struct ChanUser *chanuser;
-        if((chanuserflags & CHANUSERFLAG_INVISIBLE) && !isBot(user)) {
+        if((chanuserflags & CHANUSERFLAG_INVISIBLE) && (!user || !isBot(user))) {
             user = createTempUser(argv[4]);
             user->flags |= USERFLAG_ISTMPUSER;
             chan->flags |= CHANFLAG_HAVE_INVISIBLES;
@@ -237,7 +237,7 @@ void recv_whohandler_354(struct ClientSocket *client, char **argv, unsigned int
             if(!(chanuser = getChanUser(user, chan))) {
                 chanuser = addChanUser(chan, user);
             }
-            chanuser->flags = (chanuser->flags & ~CHANUSERFLAG_OPPED_OR_VOICED) | chanuserflags;
+            chanuser->flags = (chanuser->flags & ~(CHANUSERFLAG_OPPED_OR_VOICED | CHANUSERFLAG_INVISIBLE)) | chanuserflags;
         }
         user->flags = (user->flags & ~USERFLAG_ISIRCOP) | userflags;
         user->last_who = time(0);