event/TimeoutMonitor: reset "active" flag before invoking OnTimeout()

The IsActive() method returned true even if the timer was not active, after it completed once. This broke the state file timer, and the state file was not saved periodically.

event/TimeoutMonitor: reset "active" flag before invoking OnTimeout()
d16fb797 · Max Kellermann · c38f29ce · d16fb797 · d16fb797
Commit d16fb797 authored Aug 24, 2014 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

NEWS NEWS +1 -0

TimeoutMonitor.cxx src/event/TimeoutMonitor.cxx +3 -1

No files found.
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ ver 0.18.13 (not yet released)
 * decoder
  - dsdiff, dsf: fix endless loop on malformed file
  - ffmpeg: support ffmpeg/libav version 11
+* fix state file saver
 * fix build failure on Darwin

 ver 0.18.12 (2014/07/30)

--- a/src/event/TimeoutMonitor.cxx
+++ b/src/event/TimeoutMonitor.cxx
@@ -64,7 +64,9 @@ TimeoutMonitor::ScheduleSeconds(unsigned s)
 void
 TimeoutMonitor::Run()
 {
-#ifndef USE_EPOLL
+#ifdef USE_EPOLL
+	active = true;
+#else
 	Cancel();
 #endif