X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_joinflood.cpp;h=edce2b22cb6310236f5fcddb1911a0113f00c761;hb=c77cc4f737c782c3a56d69da0eac82edd41d4976;hp=81ad7e1692de7560c2abe8f225debe3f9be107a7;hpb=6c7a3ceb6c674a9af09da955ee0238e9291cf29a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 81ad7e169..edce2b22c 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -124,12 +124,8 @@ class JoinFlood : public ModeHandler
 			if (!channel->IsModeSet(this))
 				return MODEACTION_DENY;
 
-			joinfloodsettings* f = ext.get(channel);
-			if (f)
-			{
-				ext.unset(channel);
-				return MODEACTION_ALLOW;
-			}
+			ext.unset(channel);
+			return MODEACTION_ALLOW;
 		}
 		return MODEACTION_DENY;
 	}
@@ -168,7 +164,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())