From 8e536ab94e9e3c3629207178f28434f70fc38fdb Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 26 May 2016 21:56:18 +0200 Subject: [PATCH] infoviewer_bb: fix display of info window_ Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/a799de3a15079ca318282fc1d2cefb156a2765d3 Author: vanhofen Date: 2016-05-26 (Thu, 26 May 2016) Origin message was: ------------------ - infoviewer_bb: fix display of info window_ --- src/gui/infoviewer_bb.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 071152147..7d1dc15fa 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -814,6 +814,14 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o void CInfoViewerBB::showIcon_CA_Status(int notfirst) { + //NI - check ecm.info + int acaid = 0; + bool got_ecmInfo = File_copy("/tmp/ecm.info", "/tmp/ecm.info.tmp"); + if (got_ecmInfo) { + g_InfoViewer->md5_ecmInfo = filehash((char *)"/tmp/ecm.info.tmp"); + acaid = parse_ecmInfo("/tmp/ecm.info.tmp"); + } + if (g_settings.infobar_casystem_display == 3) return; if(NeutrinoMessages::mode_ts == CNeutrinoApp::getInstance()->getMode() && !CMoviePlayerGui::getInstance().timeshift){ @@ -865,15 +873,9 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) icon_space_offset = 0; } #endif - //NI - check ecm.info - int acaid = 0; - if (File_copy("/tmp/ecm.info", "/tmp/ecm.info.tmp")) { - g_InfoViewer->md5_ecmInfo = filehash((char *)"/tmp/ecm.info.tmp"); - acaid = parse_ecmInfo("/tmp/ecm.info.tmp"); - } - else - if(camCI) - decode = CARD; + //NI + if (!got_ecmInfo && camCI) + decode = CARD; //NI - map betacrypt to nagra if((acaid & 0xFF00)== 0x1700 && (caids[3]& 0xFF00) == 0x1800) @@ -1139,7 +1141,7 @@ int CInfoViewerBB::parse_ecmInfo(const char * file) } } fclose(fh); - remove("/tmp/ecm.info.tmp"); + remove(file); if(buffer) free(buffer); }