From 3f184e79d4f473aab2d08279cfc276d2ce560610 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sat, 15 Jan 2022 22:35:43 +0000
Subject: Fix using the oper channel limit even if it is lower than the general
 limit.

---
 src/channels.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/channels.cpp')

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)
-- 
cgit v1.3.1-10-gc9f91