m_spanningtree Squit dead servers immediately when they die, not at the next timer tick

2 files changed, 1 insertions, 6 deletions

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 0747b96a6..74bbf0b8a 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -169,12 +169,6 @@ restart:
 		if (s->IsRoot())
 			continue;
 
-		if (s->GetSocket()->GetLinkState() == DYING)
-		{
-			s->GetSocket()->Close();
-			goto restart;
-		}
-
 		// Do not ping servers that are not fully connected yet!
 		// Servers which are connected to us have IsLocal() == true and if they're fully connected
 		// then Socket->LinkState == CONNECTED. Servers that are linked to another server are always fully connected.
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index 8dd62a1e9..4e738488b 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -128,6 +128,7 @@ void TreeSocket::OnError(BufferedSocketError e)
 	ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' failed with error: %s",
 		linkID.c_str(), getError().c_str());
 	LinkState = DYING;
+	Close();
 }
 
 void TreeSocket::SendError(const std::string &errormessage)