summaryrefslogtreecommitdiff
path: root/src/modules/m_joinflood.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/m_joinflood.cpp')
-rw-r--r--src/modules/m_joinflood.cpp10
1 files changed, 3 insertions, 7 deletions
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())