mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

[timers] fix start timers

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: de6f90ac27
Author: TangoCash <eric@loxat.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2016-11-19 11:57:27 +01:00
parent 705930e152
commit 5de35b2406
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/timerd/timermanager.cpp
View File

@@ -1216,7 +1216,7 @@ CTimerEvent_Record::CTimerEvent_Record(CConfigFile *config, int iId):
//------------------------------------------------------------ //------------------------------------------------------------
void CTimerEvent_Record::fireEvent() void CTimerEvent_Record::fireEvent()
{ {
if (adjustToCurrentEPG()) if ((adjustToCurrentEPG()) && (alarmTime > time(NULL)))
return; return;
getEpgId(); getEpgId();
CTimerd::RecordingInfo ri=eventInfo; CTimerd::RecordingInfo ri=eventInfo;
@@ -1232,7 +1232,7 @@ void CTimerEvent_Record::fireEvent()
//------------------------------------------------------------ //------------------------------------------------------------
void CTimerEvent_Record::announceEvent() void CTimerEvent_Record::announceEvent()
{ {
if (adjustToCurrentEPG()) if ((adjustToCurrentEPG()) && (announceTime > time(NULL)))
return; return;
Refresh(); Refresh();
CTimerd::RecordingInfo ri=eventInfo; CTimerd::RecordingInfo ri=eventInfo;
@@ -1368,9 +1368,11 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
_stopTime += post; _stopTime += post;
} }
if ((_alarmTime != alarmTime) || (_announceTime != announceTime) || (_stopTime != stopTime)) if ((_alarmTime != alarmTime) || (_announceTime != announceTime) || (_stopTime != stopTime)) {
alarmTime = _alarmTime; announceTime = _announceTime; stopTime = _stopTime;
if (CTimerManager::getInstance()->adjustEvent(eventID, _announceTime, _alarmTime, _stopTime)) if (CTimerManager::getInstance()->adjustEvent(eventID, _announceTime, _alarmTime, _stopTime))
return true; return true;
}
return false; return false;
} }