From 0f91b6173b506332ee5f771f35698f6815a11f6a Mon Sep 17 00:00:00 2001
From: Attila Molnar <attilamolnar@hush.com>
Date: Sun, 19 Jan 2014 17:04:11 +0100
Subject: m_joinflood Fix remote joins affecting local joinflood state when the
 channel is locked

Fixes issue #694 reported by @TurkDesk
---
 src/modules/m_joinflood.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 0c68da1fb..40f7f1ba9 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -231,7 +231,7 @@ class ModuleJoinFlood : public Module
 		joinfloodsettings *f = jf.ext.get(memb->chan);
 
 		/* But all others are OK */
-		if (f)
+		if ((f) && (!f->islocked()))
 		{
 			f->addjoin();
 			if (f->shouldlock())
-- 
cgit v1.2.3