From 9bb71d8b8885ba5577d7a5da97be4398edf8c667 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 2 Sep 2018 01:42:52 +0200 Subject: [PATCH] Revert "- xmltv: move code to read xmltv.xml to the already existing place where epg is read" This reverts commit 8a28b9cc6913b0574e3b18933cbdae279721cd6a because xmltv.tv must be read as late as possible. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/1e0eaf7334fca6806d79a2a7bc77298f6a847c9d Author: vanhofen Date: 2018-09-02 (Sun, 02 Sep 2018) --- src/neutrino.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 9a17abb81..8aa749952 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2284,13 +2284,9 @@ 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; @@ -2778,6 +2774,9 @@ 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);