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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9415af0801
Author: vanhofen <vanhofen@gmx.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:
vanhofen
2016-11-19 21:12:15 +01:00
parent a413bfb40d 16478a2d33
commit f070283853
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/timerd/timermanager.cpp
View File

@@ -1224,7 +1224,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;
@@ -1240,7 +1240,7 @@ void CTimerEvent_Record::fireEvent()
//------------------------------------------------------------
void CTimerEvent_Record::announceEvent()
{
if (adjustToCurrentEPG())
if ((adjustToCurrentEPG()) && (announceTime > time(NULL)))
return;
Refresh();
CTimerd::RecordingInfo ri=eventInfo;
@@ -1344,6 +1344,9 @@ void CTimerEvent_Record::Refresh()
//------------------------------------------------------------
bool CTimerEvent_Record::adjustToCurrentEPG()
{
if (!(access(CONFIGDIR"/.adjust", F_OK) == 0))
return false;
if (!autoAdjustToEPG)
return false;
@@ -1380,9 +1383,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;
}