Remove the timer (its unsafe on unload) and replace with OnBackgroundTimer. If i remember right this isnt needed in 1.1 as we made timers safer.

git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@9236 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 6 insertions, 15 deletions

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 1020d22fb..eb2023eab 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -46,16 +46,6 @@ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me)
 	ServerInstance->AddCommand(command_rconnect);
 	command_rsquit = new cmd_rsquit(ServerInstance, this, Utils);
 	ServerInstance->AddCommand(command_rsquit);
-	if (Utils->EnableTimeSync)
-	{
-		SyncTimer = new TimeSyncTimer(ServerInstance, this);
-		ServerInstance->Timers->AddTimer(SyncTimer);
-	}
-	else
-		SyncTimer = NULL;
-
-	RefreshTimer = new CacheRefreshTimer(ServerInstance, Utils);
-	ServerInstance->Timers->AddTimer(RefreshTimer);
 }
 
 void ModuleSpanningTree::ShowLinks(TreeServer* Current, userrec* user, int hops)
@@ -979,6 +969,12 @@ void ModuleSpanningTree::OnBackgroundTimer(time_t curtime)
 {
 	AutoConnectServers(curtime);
 	DoPingChecks(curtime);
+	if (curtime % 60 == 0)
+	{
+		if (Utils->EnableTimeSync)
+			BroadcastTimeSync();
+		Utils->RefreshIPCache();
+	}
 }
 
 void ModuleSpanningTree::OnUserJoin(userrec* user, chanrec* channel, bool &silent)
@@ -1418,11 +1414,6 @@ ModuleSpanningTree::~ModuleSpanningTree()
 {
 	/* This will also free the listeners */
 	delete Utils;
-	if (SyncTimer)
-		ServerInstance->Timers->DelTimer(SyncTimer);
-
-	ServerInstance->Timers->DelTimer(RefreshTimer);
-
 	ServerInstance->DoneWithInterface("InspSocketHook");
 }