diff options
| author |  Attila Molnar | 2014-01-21 18:44:08 +0100 |
|---|---|---|
| committer | Attila Molnar | 2014-01-21 18:44:08 +0100 |
| commit | e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804 (patch) | |
| tree | 5a69b0efe6c0b7ab88925d3d066271ec40845e23 /src/modules/m_joinflood.cpp | |
| parent | m_spanningtree Fix routing of ROUTE_TYPE_MESSAGE messages (diff) | |
| parent | Release 2.0.15 (diff) | |
| download | inspircd++-e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804.tar.gz inspircd++-e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804.tar.bz2 inspircd++-e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804.zip | |
Merge insp20
Diffstat (limited to 'src/modules/m_joinflood.cpp')
| -rw-r--r-- | src/modules/m_joinflood.cpp | 10 |
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()) |