Fix valgrind issues and crashes on exit

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11794 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 5 insertions, 5 deletions

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index b0829cc1d..8b9f40e0b 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -368,6 +368,7 @@ void ModuleSpanningTree::DoConnectTimeout(time_t curtime)
 				failovers.push_back(s->myautoconnect);
 			Utils->timeoutlist.erase(me);
 			s->Close();
+			ServerInstance->GlobalCulls.AddItem(s);
 		}
 	}
 	for(unsigned int j=0; j < failovers.size(); j++)
@@ -963,7 +964,10 @@ void ModuleSpanningTree::OnEvent(Event* event)
 
 bool ModuleSpanningTree::cull()
 {
-	return Utils->cull();
+	Utils->cull();
+	ServerInstance->Timers->DelTimer(RefreshTimer);
+	ServerInstance->Modules->DoneWithInterface("BufferedSocketHook");
+	return this->Module::cull();
 }
 
 ModuleSpanningTree::~ModuleSpanningTree()
@@ -976,10 +980,6 @@ ModuleSpanningTree::~ModuleSpanningTree()
 
 	delete command_rconnect;
 	delete command_rsquit;
-
-	ServerInstance->Timers->DelTimer(RefreshTimer);
-
-	ServerInstance->Modules->DoneWithInterface("BufferedSocketHook");
 }
 
 Version ModuleSpanningTree::GetVersion()