Prechádzať zdrojové kódy

Merge branch 'maint'

* maint:
  Update docs
  Remove channel limit when limitraise is disabled (#76)
Bryan Drewery 11 rokov pred
rodič
commit
492a726556
2 zmenil súbory, kde vykonal 3 pridanie a 0 odobranie
  1. 1 0
      doc/UPDATES
  2. 2 0
      src/mod/channels.mod/chanmisc.c

+ 1 - 0
doc/UPDATES

@@ -17,6 +17,7 @@ maint
   * Binary now uses libelf internally for handling conf data.
   * Bot responses are now clear and nice. Recompile with your own list if you want
     in doc/responses.txt
+  * Remove channel limit when limitraise is disabled (#77)
 
 1.4.3
   * Default 'set promisc' to ignore since it's usually a false positive

+ 2 - 0
src/mod/channels.mod/chanmisc.c

@@ -385,6 +385,8 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
           strlcpy(result, "channel limit needs argument", RESULT_LEN);
         return ERROR;
       }
+      if (chan->limitraise && !atoi(item[i]) && dolimit(chan)) //limitraise was disabled by the user
+        add_mode(chan, '-', 'l', "");
       chan->limitraise = atoi(item[i]);
       chan->limit_prot = 0;
     } else if (!strcmp(item[i], "fish-key")) {