X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=fc8071671e01a009ac96488104594ccc737b69a8;hb=a3cdff95f4120526d0944a6bb6b3a96136466aa8;hp=b9c87c873f0ab763396e7fac47074a073569a33d;hpb=6a869d0701bbfe3c7a5e370793adfda4b5b45c65;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/timer.cpp b/src/timer.cpp index b9c87c873..fc8071671 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-2010 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -16,17 +16,23 @@ #include "inspircd.h" #include "timer.h" -TimerManager::TimerManager(InspIRCd* Instance) : ServerInstance(Instance) +TimerManager::TimerManager() { } +TimerManager::~TimerManager() +{ + for(std::vector::iterator i = Timers.begin(); i != Timers.end(); i++) + delete *i; +} + void TimerManager::TickTimers(time_t TIME) { while ((Timers.size()) && (TIME > (*Timers.begin())->GetTimer())) { std::vector::iterator i = Timers.begin(); Timer *t = (*i); - + // Probable fix: move vector manipulation to *before* we modify the vector. Timers.erase(i); @@ -62,5 +68,3 @@ bool TimerManager::TimerComparison( Timer *one, Timer *two) { return (one->GetTimer()) < (two->GetTimer()); } - -