From d0c458f5c3e0d33e62c3a05b3624468e868eb03c Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Thu, 17 Jun 2021 17:01:39 +0100
Subject: Fix joinflood applying the bootwait timeout to rehashes.

---
 src/modules/m_joinflood.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/modules/m_joinflood.cpp')

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
-- 
cgit v1.3.1-10-gc9f91