diff --git a/src/neutrino.cpp b/src/neutrino.cpp index bb00e8675..94633478b 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -714,15 +714,15 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.webtv_xml.push_back(webtv_xml); } - g_settings.web_epg.clear(); - int webepg_count = configfile.getInt32("webepg_count", 0); + g_settings.webepg_xml.clear(); + int webepg_count = configfile.getInt32("webepg_xml_count", 0); if (webepg_count) { for (int i = 0; i < webepg_count; i++) { - std::string k = "webepg_" + to_string(i); - std::string web_epg = configfile.getString(k, ""); - if (web_epg.empty()) + std::string k = "webepg_xml_" + to_string(i); + std::string webepg_xml = configfile.getString(k, ""); + if (webepg_xml.empty()) continue; - g_settings.web_epg.push_back(web_epg); + g_settings.webepg_xml.push_back(webepg_xml); } } @@ -1426,12 +1426,12 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32 ( "webtv_xml_count", g_settings.webtv_xml.size()); int webepg_count = 0; - for (std::list::iterator it = g_settings.web_epg.begin(); it != g_settings.web_epg.end(); ++it) { - std::string k = "webepg_" + to_string(webepg_count); + for (std::list::iterator it = g_settings.webepg_xml.begin(); it != g_settings.webepg_xml.end(); ++it) { + std::string k = "webepg_xml_" + to_string(webepg_count); configfile.setString(k, *it); webepg_count++; } - configfile.setInt32 ( "webepg_count", g_settings.web_epg.size()); + configfile.setInt32 ( "webepg_xml_count", g_settings.webepg_xml.size()); saveKeys(); @@ -2583,7 +2583,7 @@ TIMER_STOP("################################## after all ####################### delete hintBox; } - for (std::list::iterator it = g_settings.web_epg.begin(); it != g_settings.web_epg.end(); ++it) + for (std::list::iterator it = g_settings.webepg_xml.begin(); it != g_settings.webepg_xml.end(); ++it) g_Sectionsd->readSIfromIPTVXML((*it).c_str()); RealRun(); diff --git a/src/system/settings.h b/src/system/settings.h index 955db1a0b..d4e714fcb 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -324,7 +324,7 @@ struct SNeutrinoSettings std::list webtv_xml; std::list webradio_xml; - std::list web_epg; + std::list webepg_xml; //personalize enum PERSONALIZE_SETTINGS //settings.h