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

diff --git a/src/timer.cpp b/src/timer.cpp
index ca7534a7c..c58440c88 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDtimer */
+/* $Core */
 
 #include "inspircd.h"
 #include "timer.h"
@@ -27,6 +27,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);
 	}
 }
 
@@ -61,5 +62,3 @@ bool TimerManager::TimerComparison( Timer *one, Timer *two)
 {
 	return (one->GetTimer()) < (two->GetTimer());
 }
-
-