mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "- xmltv: move code to read xmltv.xml to the already existing place where epg is read"

Browse Source 
This reverts commit 8a28b9cc69
because xmltv.tv must be read as late as possible.


Origin commit data
------------------
Commit: 1e0eaf7334
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-02 (Sun, 02 Sep 2018)
This commit is contained in:
vanhofen
2018-09-02 01:42:52 +02:00
parent 14a4368880
commit 9bb71d8b88
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/neutrino.cpp
View File

@@ -2284,13 +2284,9 @@ void CNeutrinoApp::InitZapper()
g_InfoViewer->start(); g_InfoViewer->start();
SendSectionsdConfig(); SendSectionsdConfig();
if (g_settings.epg_read) if (g_settings.epg_read) {
{ if(stat(g_settings.epg_dir.c_str(), &my_stat) == 0)
if (stat(g_settings.epg_dir.c_str(), &my_stat) == 0)
g_Sectionsd->readSIfromXML(g_settings.epg_dir.c_str()); g_Sectionsd->readSIfromXML(g_settings.epg_dir.c_str());
for (std::list<std::string>::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; int tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV;
lastChannelMode = tvmode ? g_settings.channel_mode : g_settings.channel_mode_radio; lastChannelMode = tvmode ? g_settings.channel_mode : g_settings.channel_mode_radio;
@@ -2778,6 +2774,9 @@ TIMER_STOP("################################## after all #######################
CFlashUpdateCheck::getInstance()->startThread(); CFlashUpdateCheck::getInstance()->startThread();
} }
for (std::list<std::string>::iterator it = g_settings.xmltv_xml.begin(); it != g_settings.xmltv_xml.end(); ++it)
g_Sectionsd->readSIfromXMLTV((*it).c_str());
RealRun(); RealRun();
ExitRun(g_info.hw_caps->can_shutdown); ExitRun(g_info.hw_caps->can_shutdown);