From d763634287d87a31b367e8ff9202c90616ba7085 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 10 Sep 2014 16:21:10 +0400 Subject: [PATCH] neutrino.cpp: avoid webtv duplicates Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/247e38a2047c7992bfeafb237a727f6769b9cd21 Author: [CST] Focus Date: 2014-09-10 (Wed, 10 Sep 2014) --- src/neutrino.cpp | 1 + src/zapit/src/getservices.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 2e0e4f1d3..04ced73d5 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -673,6 +673,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.logo_hdd_dir = configfile.getString( "logo_hdd_dir", "/media/sda1/logos" ); + g_settings.webtv_xml.clear(); int webtv_count = configfile.getInt32("webtv_xml_count", 0); if (webtv_count) { for (int i = 0; i < webtv_count; i++) { diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index db60aeaf8..a0be6100b 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -931,7 +931,7 @@ bool CServiceManager::LoadServices(bool only_current) if (webtv_xml) { for (std::list::iterator it = webtv_xml->begin(); it != webtv_xml->end(); ++it) { if (!access((*it).c_str(), R_OK)) { - INFO("Loading webtv..."); + INFO("Loading webtv from %s ...", (*it).c_str()); parser = parseXmlFile((*it).c_str()); if (parser == NULL) continue;