From 4c34c5b3f44f35781bb26c7b7700c32b36ac329f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 1 Sep 2018 14:34:25 +0200 Subject: [PATCH] xmltv: move code to read xmltv.xml to the already existing place where epg is read Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1239c132dd3968f74aaf037f08af6eda604efa50 Author: vanhofen Date: 2018-09-01 (Sat, 01 Sep 2018) Origin message was: ------------------ - xmltv: move code to read xmltv.xml to the already existing place where epg is read ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 8aa749952..9a17abb81 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2284,9 +2284,13 @@ void CNeutrinoApp::InitZapper() g_InfoViewer->start(); SendSectionsdConfig(); - if (g_settings.epg_read) { - if(stat(g_settings.epg_dir.c_str(), &my_stat) == 0) + if (g_settings.epg_read) + { + if (stat(g_settings.epg_dir.c_str(), &my_stat) == 0) g_Sectionsd->readSIfromXML(g_settings.epg_dir.c_str()); + + for (std::list::iterator it = g_settings.xmltv_xml.begin(); it != g_settings.xmltv_xml.end(); ++it) + g_Sectionsd->readSIfromXMLTV((*it).c_str()); } int tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV; lastChannelMode = tvmode ? g_settings.channel_mode : g_settings.channel_mode_radio; @@ -2774,9 +2778,6 @@ TIMER_STOP("################################## after all ####################### CFlashUpdateCheck::getInstance()->startThread(); } - for (std::list::iterator it = g_settings.xmltv_xml.begin(); it != g_settings.xmltv_xml.end(); ++it) - g_Sectionsd->readSIfromXMLTV((*it).c_str()); - RealRun(); ExitRun(g_info.hw_caps->can_shutdown);