* Port [3454] to 1.2.14

 * Fixed +closed from interfering with 'chanmode -pi'. (fixes #294)



svn: 3455

doc/UPDATES

@@ -50,6 +50,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Cleanup cmd_userlist to list hubs/leafs/backups (fixes #363)
 * Bots will now cycle nicks on servers which claim their nick is invalid. (fixes #311)
 * Limit bots no longer set limit when 'chanmode -l' is set. (fixes #294)
+* Fixed +closed from interfering with 'chanmode -pi'. (fixes #294)
 
 1.2.13 - http://wraith.shatow.net/milestone/1.2.13
 * Fix cmd_chanset accepting invalid flags

src/mod/irc.mod/chan.c

@@ -1080,9 +1080,9 @@ void enforce_closed(struct chanset_t *chan) {
 
   char buf[3] = "", *p = buf;
 
-  if (chan->closed_invite && !(chan->channel.mode & CHANINV))
+  if (chan->closed_invite && !(chan->channel.mode & CHANINV) && !(chan->mode_mns_prot & CHANINV))
     *p++ = 'i';
-  if (chan->closed_private && !(chan->channel.mode & CHANPRIV))
+  if (chan->closed_private && !(chan->channel.mode & CHANPRIV) && !(chan->mode_mns_prot & CHANPRIV))
     *p++ = 'p';
   *p = 0;
   if (buf && buf[0])