* Port [3241] to 1.2.14

 * Fix cmd_checkchannels not taking slowjoin into account.



svn: 3242

doc/UPDATES

@@ -22,6 +22,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Fix bots sharing wrong channel keys over botnet.
 * Cmd_swhois now displays a list of only 'public' channels as well.
 * Fix cmd_mns_user being ran on self-bot. (fixes #350)
+* Fix cmd_checkchannels not taking slowjoin into account.
 
 1.2.13 - http://wraith.shatow.net/milestone/1.2.13
 * Fix cmd_chanset accepting invalid flags

src/mod/channels.mod/channels.c

@@ -191,7 +191,7 @@ void rcmd_chans(char *fbot, char *fhand, char *fidx) {
 
   if (server_online) {
     for (chan = chanset; chan; chan = chan->next) {
-      if (shouldjoin(chan) && !channel_active(chan)) {
+      if (!channel_active(chan) && (shouldjoin(chan) || chan->channel.jointime)) {
         simple_snprintf(buf, sizeof(buf), "%s%s%s", buf[0] ? buf : "", buf[0] ? " " : "", chan->dname);
       }
     }