[timers] fix start timers

This commit is contained in:
TangoCash
2016-11-19 11:57:27 +01:00
parent 72ee10b43c
commit de6f90ac27

View File

@@ -1216,7 +1216,7 @@ CTimerEvent_Record::CTimerEvent_Record(CConfigFile *config, int iId):
//------------------------------------------------------------
void CTimerEvent_Record::fireEvent()
{
if (adjustToCurrentEPG())
if ((adjustToCurrentEPG()) && (alarmTime > time(NULL)))
return;
getEpgId();
CTimerd::RecordingInfo ri=eventInfo;
@@ -1232,7 +1232,7 @@ void CTimerEvent_Record::fireEvent()
//------------------------------------------------------------
void CTimerEvent_Record::announceEvent()
{
if (adjustToCurrentEPG())
if ((adjustToCurrentEPG()) && (announceTime > time(NULL)))
return;
Refresh();
CTimerd::RecordingInfo ri=eventInfo;
@@ -1368,9 +1368,11 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
_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))
return true;
}
return false;
}