mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +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 
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fac2d36cda
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-04 21:14:27 +01:00
parent 7cc162c6d5 b92d58d0ec
commit 335bcb6e0d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/timerd/timermanager.cpp
View File

@@ -1176,7 +1176,10 @@ CTimerEvent_Record::CTimerEvent_Record(time_t announce_Time, time_t alarm_Time,
eventInfo.epg_starttime = epg_starttime;
eventInfo.channel_id = channel_id;
eventInfo.apids = apids;
eventInfo.autoAdjustToEPG = _autoAdjustToEPG;
eventInfo.recordingSafety = _recordingSafety;
eventInfo.channel_ci = channel_ci; //NI
recordingDir = recDir;
epgTitle="";
autoAdjustToEPG = _autoAdjustToEPG;