From 068f868b038fb366d1fc407d77a58d0f119abc52 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 21 Jun 2017 10:31:22 +0200 Subject: [PATCH] timermanager: don't set stoptime for timers without a stop-event Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/57ff49c32133e14903aae44c1b769aefd25776c0 Author: vanhofen Date: 2017-06-21 (Wed, 21 Jun 2017) Origin message was: ------------------ - timermanager: don't set stoptime for timers without a stop-event Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/timerd/timermanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/timerd/timermanager.cpp b/src/timerd/timermanager.cpp index 8998ea2d2..82051b394 100644 --- a/src/timerd/timermanager.cpp +++ b/src/timerd/timermanager.cpp @@ -332,7 +332,7 @@ int CTimerManager::modifyEvent(int peventID, time_t announceTime, time_t alarmTi CTimerEvent *event = events[peventID]; event->announceTime = announceTime; event->alarmTime = alarmTime; - event->stopTime = stopTime; + event->stopTime = (event->eventType == CTimerd::TIMER_RECORD) ? stopTime : 0; if(event->eventState==CTimerd::TIMERSTATE_PREANNOUNCE) event->eventState = CTimerd::TIMERSTATE_SCHEDULED; event->eventRepeat = evrepeat;