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_denychans.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index c316a9da4..9e7454c0e 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -144,8 +144,11 @@ class ModuleDenyChannels : public Module
 		goodchannels.swap(goodchans);
 	}
 
-	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 (!override)
+			return MOD_RES_PASSTHRU;
+
 		for (const auto& badchan : badchannels)
 		{
 			// If the channel does not match the current entry we have nothing else to do.
-- 
cgit v1.3.1-10-gc9f91