mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "eitd/xmlutil.cpp: fix crash, if epg data saved with older image -"

Browse Source 
This reverts commit 1f65f1bc80.

already have a more general solution
This commit is contained in:
Stefan Seyfried
2012-11-22 22:38:39 +01:00
parent b48209241c
commit 57113fdfbc
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/eitd/xmlutil.cpp
View File

@@ -334,18 +334,16 @@ void *insertEventsfromFile(void * data)
std::string(xmlGetAttribute(node, "string"))); std::string(xmlGetAttribute(node, "string")));
node = node->xmlNextNode; node = node->xmlNextNode;
} }
while (xmlGetNextOccurence(node, "item") != NULL) {
#ifdef USE_ITEM_DESCRIPTION #ifdef USE_ITEM_DESCRIPTION
while (xmlGetNextOccurence(node, "item") != NULL) {
e.item = std::string(xmlGetAttribute(node, "string")); e.item = std::string(xmlGetAttribute(node, "string"));
#endif
node = node->xmlNextNode; node = node->xmlNextNode;
} }
while (xmlGetNextOccurence(node, "item_description") != NULL) { while (xmlGetNextOccurence(node, "item_description") != NULL) {
#ifdef USE_ITEM_DESCRIPTION
e.itemDescription = std::string(xmlGetAttribute(node, "string")); e.itemDescription = std::string(xmlGetAttribute(node, "string"));
#endif
node = node->xmlNextNode; node = node->xmlNextNode;
} }
#endif
while (xmlGetNextOccurence(node, "extended_text") != NULL) { while (xmlGetNextOccurence(node, "extended_text") != NULL) {
e.appendExtendedText( std::string(ZapitTools::UTF8_to_Latin1(xmlGetAttribute(node, "lang"))), e.appendExtendedText( std::string(ZapitTools::UTF8_to_Latin1(xmlGetAttribute(node, "lang"))),
std::string(xmlGetAttribute(node, "string"))); std::string(xmlGetAttribute(node, "string")));