aboutsummaryrefslogtreecommitdiff
path: root/src/channels.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2022-01-15 22:35:43 +0000
committerGravatar Sadie Powell2022-01-15 22:36:28 +0000
commit3f184e79d4f473aab2d08279cfc276d2ce560610 (patch)
tree9ecc128d784a3cea6427ccf089b1751c0f49f8ca /src/channels.cpp
parentImprove CI scripts. (diff)
Fix using the oper channel limit even if it is lower than the general limit.
Diffstat (limited to 'src/channels.cpp')
-rw-r--r--src/channels.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 67f908195..ce24db9b1 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -186,7 +186,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co
// If not set, use 2.0's <channels:opers>, if that's not set either, use limit from CC
if (!opermaxchans && user->HasPrivPermission("channels/high-join-limit"))
opermaxchans = ServerInstance->Config->OperMaxChans;
- if (opermaxchans)
+ if (opermaxchans < maxchans)
maxchans = opermaxchans;
}
if (user->chans.size() >= maxchans)