mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

supplemental to ''add option to map xml epg to normal channels''

Browse Source 
fix logic

804a6c9715d0ed5e8226e233cbb9f77f07dfcf5b

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
TangoCash
2018-10-28 10:19:59 +01:00
committed by Thilo Graf
parent 73e9953e07
commit 84143d9ab8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/zapit/src/bouquets.cpp
View File

@@ -1290,7 +1290,7 @@ void CBouquetManager::readEPGMapping()
{ {
const char *channelid = xmlGetAttribute(epgmap, "channel_id"); const char *channelid = xmlGetAttribute(epgmap, "channel_id");
const char *epgid = xmlGetAttribute(epgmap, "new_epg_id"); const char *epgid = xmlGetAttribute(epgmap, "new_epg_id");
const char *xmlepg = xmlGetData(epgmap); const char *xmlepg = xmlGetData(epgmap); // returns empty string, not NULL if nothing found
t_channel_id epg_id = 0; t_channel_id epg_id = 0;
t_channel_id channel_id = 0; t_channel_id channel_id = 0;
if (epgid) if (epgid)
@@ -1300,7 +1300,7 @@ void CBouquetManager::readEPGMapping()
if(channel_id && epg_id){ if(channel_id && epg_id){
EpgIDMapping[channel_id]=epg_id; EpgIDMapping[channel_id]=epg_id;
} }
if(channel_id && xmlepg){ if(channel_id && ((xmlepg != NULL) && (xmlepg[0] != '\0'))){
EpgXMLMapping[channel_id]=xmlepg; EpgXMLMapping[channel_id]=xmlepg;
} }
epgmap = xmlNextNode(epgmap); epgmap = xmlNextNode(epgmap);