]> git.netwichtig.de Git - user/henk/code/inspircd.git/commitdiff
m_joinflood Fix remote joins affecting local joinflood state when the channel is...
authorAttila Molnar <attilamolnar@hush.com>
Sun, 19 Jan 2014 16:04:11 +0000 (17:04 +0100)
committerAttila Molnar <attilamolnar@hush.com>
Sun, 19 Jan 2014 16:04:11 +0000 (17:04 +0100)
Fixes issue #694 reported by @TurkDesk

src/modules/m_joinflood.cpp

index 0c68da1fb42445433e7777b1ef75cfe0d1190aab..40f7f1ba9865a7b246d8f20a9f122b824db12d37 100644 (file)
@@ -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())