m_operjoin Remove duplicated code

[user/henk/code/inspircd.git] / src / modules / m_joinflood.cpp

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 81ad7e1692de7560c2abe8f225debe3f9be107a7..edce2b22cb6310236f5fcddb1911a0113f00c761 100644 (file)
--- 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())