summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-01-19 17:04:11 +0100
committerAttila Molnar <attilamolnar@hush.com>2014-01-19 17:04:11 +0100
commit0f91b6173b506332ee5f771f35698f6815a11f6a (patch)
treecdf72d14cf3c33b91fd0e5ef2c1b689e9f53cb58 /src
parentf75a0d5482a09fffc0cc6cfece80bb2f1e4de815 (diff)
m_joinflood Fix remote joins affecting local joinflood state when the channel is locked
Fixes issue #694 reported by @TurkDesk
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_joinflood.cpp2
1 files changed, 1 insertions, 1 deletions
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())