Merge branch 'ni/cst-next' into ni/mp/cst-next

Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fda1cda516
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-06 (Tue, 06 Sep 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-06 15:24:30 +02:00
23 changed files with 1035 additions and 53 deletions

View File

@@ -1282,7 +1282,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
picname = imdb->getFilename(channel, epgData.eventID);
CFileHelpers fh;
if (!fh.copyFile(imdb->posterfile.c_str(), picname.c_str()))
if (!fh.copyFile(imdb->posterfile.c_str(), picname.c_str(), 644))
perror( "IMDb: error copy file" );
sleep(2);