Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 151df1b8164d2bdfdc03bdbb049686c038a7cff8 (commit)
from 641a9f9b2bee4618553f2673a22c65c424b56b74 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 151df1b8164d2bdfdc03bdbb049686c038a7cff8
Author: martii <m4...@gm...>
Date: Sun Dec 22 21:58:24 2013 +0100
timerd: don't let getSleeptimerID return an already terminated id
Signed-off-by: Christian Schuett <Gau...@ho...>
Signed-off-by: Thilo Graf <db...@no...>
diff --git a/tuxbox/neutrino/daemons/timerd/timerd.cpp b/tuxbox/neutrino/daemons/timerd/timerd.cpp
index d318cce..a30684b 100644
--- a/tuxbox/neutrino/daemons/timerd/timerd.cpp
+++ b/tuxbox/neutrino/daemons/timerd/timerd.cpp
@@ -71,8 +71,9 @@ bool parse_command(CBasicMessage::Header &rmsg, int connfd)
{
for (pos = events.begin(); pos != events.end(); ++pos)
{
- printf("ID: %u type: %u\n",pos->second->eventID,pos->second->eventType);
- if(pos->second->eventType == CTimerd::TIMER_SLEEPTIMER)
+ dprintf("ID: %u type: %u\n", pos->second->eventID, pos->second->eventType);
+ if (pos->second->eventType == CTimerd::TIMER_SLEEPTIMER &&
+ pos->second->eventState != CTimerd::TIMERSTATE_TERMINATED)
{
rspGetSleeptimer.eventID = pos->second->eventID;
break;
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/timerd/timerd.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
--
Tuxbox-GIT: apps
|
