aboutsummaryrefslogtreecommitdiff
path: root/src/modules/m_joinflood.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2021-06-17 17:01:39 +0100
committerGravatar Sadie Powell2021-06-18 10:54:17 +0100
commitd0c458f5c3e0d33e62c3a05b3624468e868eb03c (patch)
tree67424aa53897df37d1fd068683f204b5fc88d34b /src/modules/m_joinflood.cpp
parentFix xline matching on WebIRC connections. (diff)
Fix joinflood applying the bootwait timeout to rehashes.
Diffstat (limited to 'src/modules/m_joinflood.cpp')
-rw-r--r--src/modules/m_joinflood.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 3241020bf..a196c5731 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -153,14 +153,15 @@ class ModuleJoinFlood
{
}
- void ReadConfig(ConfigStatus&) CXX11_OVERRIDE
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
ConfigTag* tag = ServerInstance->Config->ConfValue("joinflood");
duration = tag->getDuration("duration", 60, 10, 600);
bootwait = tag->getDuration("bootwait", 30);
splitwait = tag->getDuration("splitwait", 30);
- ignoreuntil = ServerInstance->startup_time + bootwait;
+ if (status.initial)
+ ignoreuntil = ServerInstance->startup_time + bootwait;
}
void OnServerSplit(const Server* server, bool error) CXX11_OVERRIDE