aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--src/event/TimeoutMonitor.cxx4
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index d67b38406..5d48d9126 100644
--- 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)
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