Extra error detection, thwap me if this comes up with false positives

[user/henk/code/inspircd.git] / src / cmd_list.cpp

diff --git a/src/cmd_list.cpp b/src/cmd_list.cpp
index 262738fb341fbc0cfdf15e8cf496e516543503b8..1676a48c09f8f23cdff610a8e6f422394dcc8093 100644 (file)
--- a/src/cmd_list.cpp
+++ b/src/cmd_list.cpp
@@ -46,9 +46,12 @@ void cmd_list::Handle (char **parameters, int pcnt, userrec *user)
        for (chan_hash::const_iterator i = chanlist.begin(); i != chanlist.end(); i++)
        {
                // if the channel is not private/secret, OR the user is on the channel anyway
-               if (((!(i->second->binarymodes & CM_PRIVATE)) && (!(i->second->binarymodes & CM_SECRET))) || (has_channel(user,i->second)))
+               bool n = i->second->HasUser(user);
+               if (((!(i->second->modes[CM_PRIVATE])) && (!(i->second->modes[CM_SECRET]))) || (n))
                {
-                       WriteServ(user->fd,"322 %s %s %d :[+%s] %s",user->nick,i->second->name,usercount_i(i->second),chanmodes(i->second,has_channel(user,i->second)),i->second->topic);
+                       long users = usercount(i->second);
+                       if (users)
+                               WriteServ(user->fd,"322 %s %s %d :[+%s] %s",user->nick,i->second->name,users,chanmodes(i->second,n),i->second->topic);
                }
        }
        WriteServ(user->fd,"323 %s :End of channel list.",user->nick);