From 84143d9ab8c47f3aefbb5ba2fa483ccdd4275b3c Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 28 Oct 2018 10:19:59 +0100 Subject: [PATCH] supplemental to ''add option to map xml epg to normal channels'' fix logic 804a6c9715d0ed5e8226e233cbb9f77f07dfcf5b Signed-off-by: Thilo Graf --- src/zapit/src/bouquets.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp index 4b7f36d0d..ba7fccdfc 100644 --- a/src/zapit/src/bouquets.cpp +++ b/src/zapit/src/bouquets.cpp @@ -1290,7 +1290,7 @@ void CBouquetManager::readEPGMapping() { const char *channelid = xmlGetAttribute(epgmap, "channel_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 channel_id = 0; if (epgid) @@ -1300,7 +1300,7 @@ void CBouquetManager::readEPGMapping() if(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; } epgmap = xmlNextNode(epgmap);