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

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

Browse Source 
Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/zapit/src/zapit.cpp


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



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-20 08:22:22 +02:00
parent 9e20137f68 40ecb9d38c
commit 1eae0a97f3
19 changed files with 104 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/infoviewer_bb.cpp
View File

@@ -1084,7 +1084,7 @@ int CInfoViewerBB::check_ecmInfo()
{
int caid = 0;
CFileHelpers fh;
if (fh.copyFile("/tmp/ecm.info", "/tmp/ecm.info.tmp", 644)) {
if (fh.copyFile("/tmp/ecm.info", "/tmp/ecm.info.tmp", 0644)) {
g_InfoViewer->md5_ecmInfo = filehash((char *)"/tmp/ecm.info.tmp");
caid = parse_ecmInfo("/tmp/ecm.info.tmp");
}