Properly remove old callbacks from modules internal list of callbacks list, and cleaned up some of the timers code

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2524 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 1 insertions, 5 deletions

diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index efbb6db83..e0fada619 100644
--- a/src/modulemanager.cpp
+++ b/src/modulemanager.cpp
@@ -479,14 +479,10 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Modul
 void ModuleManager::ClearTimers(Module *m)
 {
 	std::list<Timer *>::iterator it;
-	Timer *t2;
 
 	for (it = m->CallBacks.begin(); it != m->CallBacks.end(); ++it)
 	{
-		t2 = *it;
-
-		TimerManager::DelTimer(t2);
+		TimerManager::DelTimer(*it);
 	}
-
 	m->CallBacks.clear();
 }