tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a crash in Timer::Reschedule 

refs #8554
This commit is contained in:
Gunnar Beutner 2015-02-27 16:44:33 +01:00
parent 5eb32efb05
commit 5d1e549063
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/base/timer.cpp
View File

@ -183,7 +183,6 @@ void Timer::Stop(void)
void Timer::Reschedule(double next) void Timer::Reschedule(double next)
{ {
ASSERT(!OwnsLock()); ASSERT(!OwnsLock());
ASSERT(!m_Running);
boost::mutex::scoped_lock lock(l_TimerMutex); boost::mutex::scoped_lock lock(l_TimerMutex);
@ -197,7 +196,7 @@ void Timer::Reschedule(double next)
m_Next = next; m_Next = next;
if (m_Started) { if (m_Started && !m_Running) {
/* Remove and re-add the timer to update the index. */ /* Remove and re-add the timer to update the index. */
l_Timers.erase(this); l_Timers.erase(this);
l_Timers.insert(this); l_Timers.insert(this);