mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
Merge branch 'ni/cst-next' into ni/mp/cst-next
Conflicts:
src/gui/components/cc_frm_footer.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: fe20c9743f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-20 (Tue, 20 Sep 2016)
This commit is contained in:
@@ -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");
|
||||
}
|
||||
|
Reference in New Issue
Block a user