From f2a0d3ee21c0a4f0fda7e4d890f1c7b22669029a Mon Sep 17 00:00:00 2001 From: martii Date: Sun, 22 Dec 2013 14:12:55 +0100 Subject: [PATCH] timerd/timerd: don't let getSleeptimerID return an already terminated id Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/787ab2e554c8801cd624d05d4b4f3ff77aa82bfa Author: martii Date: 2013-12-22 (Sun, 22 Dec 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/timerd/timerd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/timerd/timerd.cpp b/src/timerd/timerd.cpp index 8037b9db2..3b6206097 100644 --- a/src/timerd/timerd.cpp +++ b/src/timerd/timerd.cpp @@ -63,8 +63,8 @@ bool timerd_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) +// printf("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;