From 3b5425e6e0776daf0632f4e86057486b60794e2c Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 18 Jun 2021 11:18:06 +0100
Subject: Fix joinflood overwriting the bootwait timer on split.

---
 src/modules/m_joinflood.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index a196c5731..05f9f0f0e 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -167,7 +167,7 @@ class ModuleJoinFlood
 	void OnServerSplit(const Server* server, bool error) CXX11_OVERRIDE
 	{
 		if (splitwait)
-			ignoreuntil = ServerInstance->Time() + splitwait;
+			ignoreuntil = std::max<time_t>(ignoreuntil, ServerInstance->Time() + splitwait);
 	}
 
 	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
-- 
cgit v1.3.1-10-gc9f91