X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=535ed3f8bbe5bcbe69a61b5d4df620a8f251208f;hb=b3e3b1f14e12b4b0a395ef8e2a4848f132e2c22b;hp=ca7534a7c7409759d42808258c3162db706f019a;hpb=c88afe5b9abba09b883d59f46a7e2795df181394;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/timer.cpp b/src/timer.cpp
index ca7534a7c..535ed3f8b 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -26,6 +26,9 @@ void TimerManager::TickTimers(time_t TIME)
 	{
 		std::vector<Timer *>::iterator i = Timers.begin();
 		Timer *t = (*i);
+		
+		// Probable fix: move vector manipulation to *before* we modify the vector.
+		Timers.erase(i);
 
 		t->Tick(TIME);
 		if (t->GetRepeat())
@@ -35,8 +38,6 @@ void TimerManager::TickTimers(time_t TIME)
 		}
 		else
 			delete t;
-
-		Timers.erase(i);
 	}
 }