diff options
author | Adam <Adam@anope.org> | 2017-04-07 14:24:25 -0400 |
---|---|---|
committer | Adam <Adam@anope.org> | 2017-04-07 14:24:25 -0400 |
commit | e851f872d5f344f943efe411e4f600b0b009d095 (patch) | |
tree | 145b2a360e681e5a2ef104cad16a41634af646b4 | |
parent | f76b923ccf7b8c7376a27df19408ee9655bbb96c (diff) | |
parent | 304494322fa515f1d6dc294e333329ca4731bd29 (diff) |
Merge commit '304494322fa515f1d6dc294e333329ca4731bd29'
-rw-r--r-- | modules/chanserv/set.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/chanserv/set.cpp b/modules/chanserv/set.cpp index 7c7233b79..04ef208af 100644 --- a/modules/chanserv/set.cpp +++ b/modules/chanserv/set.cpp @@ -1280,7 +1280,7 @@ class CSSet : public Module { if (chan->ci->IsNoAutoop()) give_modes = false; - if (chan->ci->IsSecureOps()) + if (chan->ci->IsSecureOps() && !user->IsProtected()) // This overrides what chanserv does because it is loaded after chanserv take_modes = true; } |