From 57113fdfbce435b5fdcb77a041a4cccc1b913ffd Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Thu, 22 Nov 2012 22:38:39 +0100 Subject: [PATCH] Revert "eitd/xmlutil.cpp: fix crash, if epg data saved with older image -" This reverts commit 1f65f1bc80d77111bb89c63db910a805c57f3f99. already have a more general solution --- src/eitd/xmlutil.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/eitd/xmlutil.cpp b/src/eitd/xmlutil.cpp index b700011f3..c57cfa023 100644 --- a/src/eitd/xmlutil.cpp +++ b/src/eitd/xmlutil.cpp @@ -334,18 +334,16 @@ void *insertEventsfromFile(void * data) std::string(xmlGetAttribute(node, "string"))); node = node->xmlNextNode; } - while (xmlGetNextOccurence(node, "item") != NULL) { #ifdef USE_ITEM_DESCRIPTION + while (xmlGetNextOccurence(node, "item") != NULL) { e.item = std::string(xmlGetAttribute(node, "string")); -#endif node = node->xmlNextNode; } while (xmlGetNextOccurence(node, "item_description") != NULL) { -#ifdef USE_ITEM_DESCRIPTION e.itemDescription = std::string(xmlGetAttribute(node, "string")); -#endif node = node->xmlNextNode; } +#endif while (xmlGetNextOccurence(node, "extended_text") != NULL) { e.appendExtendedText( std::string(ZapitTools::UTF8_to_Latin1(xmlGetAttribute(node, "lang"))), std::string(xmlGetAttribute(node, "string")));