From 93b0661ddaebc82df76e0268ebe0ab0c17f7cbc7 Mon Sep 17 00:00:00 2001 From: w00t Date: Fri, 12 Dec 2008 21:10:34 +0000 Subject: Fix problem with autoconnects: don't reset NextConnectTime to a higher value than it currently is, as that doesn't play very nice with multiple autoconnect values.. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10879 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/utils.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index 06851619c..f6e3ad6bd 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -536,7 +536,9 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind) } - L.NextConnectTime = ServerInstance->Time() + L.AutoConnect; + // Fix: Only trip autoconnects if this wouldn't delay autoconnect.. + if (L.NextConnectTime > ((time_t)(ServerInstance->Time() + L.AutoConnect))) + L.NextConnectTime = ServerInstance->Time() + L.AutoConnect; if (L.Name.find('.') == std::string::npos) throw CoreException("The link name '"+assign(L.Name)+"' is invalid and must contain at least one '.' character"); -- cgit v1.2.3