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

1 files changed, 3 insertions, 1 deletions

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");