mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-06-21 13:54:49 +02:00
parent cf951434d5 579a73f91b
commit 2ddad19873
20 changed files with 160 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/timerd/timermanager.cpp
View File

@@ -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;