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

Merge branch 'uncool/dvbsi++' commit 785d3f2046

Browse Source 
Conflicts:
	src/eitd/SIevents.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e701bfefc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-01-29 21:27:41 +01:00
parent 8e16ebd4d5 785d3f2046
commit 1b04f81e17
9 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/timerd/timermanager.cpp
View File

@@ -1145,6 +1145,7 @@ CTimerEvent_Record::CTimerEvent_Record(CConfigFile *config, int iId):
//------------------------------------------------------------
void CTimerEvent_Record::fireEvent()
{
Refresh();
CTimerd::RecordingInfo ri=eventInfo;
ri.eventID=eventID;
strcpy(ri.recordingDir, recordingDir.substr(0,sizeof(ri.recordingDir)-1).c_str());