From ee1325cf9ddcb47b2d2c1b79093e0fa5a38b75c7 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sun, 23 May 2021 01:53:34 +0100
Subject: Fire OnUserPreJoin regardless of whether the join is an override.

---
 src/modules/m_operchans.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/modules/m_operchans.cpp')

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 4f5a0f74c..2b69b2f09 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -75,9 +75,9 @@ class ModuleOperChans
 	{
 	}
 
-	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) override
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven, bool override) override
 	{
-		if (chan && chan->IsModeSet(oc) && !user->IsOper())
+		if (!override && chan && chan->IsModeSet(oc) && !user->IsOper())
 		{
 			user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, InspIRCd::Format("Only server operators may join %s (+O is set)", chan->name.c_str()));
 			return MOD_RES_DENY;
-- 
cgit v1.3.1-10-gc9f91