diff options
| author | Max Kellermann <max@duempel.org> | 2014-08-24 13:13:12 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-08-24 13:13:12 +0200 |
| commit | d16fb797088e32cccecd6373fbe5eaefff423de2 (patch) | |
| tree | 2d92d82636e38b6e92c75fdc11ee24f7ea2f0a95 | |
| parent | c38f29ce561a5c79a82c1c60c34ef88b5ded0660 (diff) | |
| download | mpd-d16fb797088e32cccecd6373fbe5eaefff423de2.tar.gz mpd-d16fb797088e32cccecd6373fbe5eaefff423de2.tar.xz mpd-d16fb797088e32cccecd6373fbe5eaefff423de2.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | src/event/TimeoutMonitor.cxx | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -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) diff --git a/src/event/TimeoutMonitor.cxx b/src/event/TimeoutMonitor.cxx index cffad6b92..b1e7174eb 100644 --- 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 |