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

Merge branch 'master' into pu/mp

Browse Source 
Origin commit data
------------------
Commit: 8b89baa7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)
This commit is contained in:
Jacek Jendrzej
2017-06-26 22:22:07 +02:00
parent da7d2ce50f b8fab4c0fb
commit e26b8378e6
10 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/timerd/timerd.cpp
View File

@@ -306,7 +306,7 @@ bool timerd_parse_command(CBasicMessage::Header &rmsg, int connfd)
CBasicServer::receive_data(connfd, &recInfo, sizeof(CTimerd::TransferRecordingInfo));
if(recInfo.recordingSafety)
{
int pre,post;
int pre = 0,post = 0;
CTimerManager::getInstance()->getRecordingSafety(pre,post);
msgAddTimer.announceTime -= pre;
msgAddTimer.alarmTime -= pre;

2
src/timerd/timermanager.cpp
View File

@@ -1347,7 +1347,7 @@ bool CTimerEvent_Record::adjustToCurrentEPG()
CChannelEventList evtlist;
CEitManager::getInstance()->getEventsServiceKey(eventInfo.channel_id, evtlist);
int pre, post;
int pre = 0, post = 0;
CTimerManager::getInstance()->getRecordingSafety(pre, post);
time_t _announceTime = announceTime;