瀏覽代碼

* Fixed 'chanset chanmode { -p }' conflicting with 'closed-private 1' (closed-private now sets to 0 if -p) (#14)

svn: 2388
Bryan Drewery 21 年之前
父節點
當前提交
b809ccbd03
共有 2 個文件被更改,包括 4 次插入0 次删除
  1. 1 0
      doc/UPDATES
  2. 3 0
      src/mod/channels.mod/channels.c

+ 1 - 0
doc/UPDATES

@@ -22,6 +22,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Fixed hub segfaults (on Linux) with bot links. (#155)
 * Removing an ignore by number now displays which ignore was removed. (#126)
 * Added hub cmd 'checkchannels' which displays in loglevel misc (+o) which chans leaf bots aren't on. (#149)
+* Fixed 'chanset chanmode { -p }' conflicting with 'closed-private 1' (closed-private now sets to 0 if -p) (#14)
 
 1.2.7
 * Forgot 'log_bad = 0;' to fix the '!' showing up for aliases.

+ 3 - 0
src/mod/channels.mod/channels.c

@@ -559,6 +559,9 @@ static void set_mode_protect(struct chanset_t *chan, char *set)
   /* Prevents a +s-p +p-s flood  (fixed by drummer) */
   if (chan->mode_pls_prot & CHANSEC)
     chan->mode_pls_prot &= ~CHANPRIV;
+
+  if (chan->mode_mns_prot & CHANPRIV && chan->closed_private)
+    chan->closed_private = 0;
 }
 
 static void get_mode_protect(struct chanset_t *chan, char *s)