git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WirelessLan/plugin.py: fix merge conflict
[enigma2.git]
/
lib
/
service
/
event.cpp
diff --git
a/lib/service/event.cpp
b/lib/service/event.cpp
index e78ddc4e1da2928bcd2000b5a7dc33a0528b2f56..949e150a7a4e1a562262bf43d9c5d074165ade44 100644
(file)
--- a/
lib/service/event.cpp
+++ b/
lib/service/event.cpp
@@
-88,7
+88,7
@@
bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
lang = cc; // use first found language
if (cc == lang)
{
lang = cc; // use first found language
if (cc == lang)
{
- m_event_name = convertDVBUTF8(
sed->getEventName(
), table, tsidonid);
+ m_event_name = convertDVBUTF8(
replace_all(replace_all(sed->getEventName(), "\n", " "), "\t", " "
), table, tsidonid);
m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid);
retval=1;
}
m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid);
retval=1;
}
@@
-154,7
+154,7
@@
bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
dvb_ref.setOriginalNetworkID(ld->getOriginalNetworkId());
dvb_ref.setServiceID(ld->getServiceId());
const PrivateDataByteVector *privateData = ld->getPrivateDataBytes();
dvb_ref.setOriginalNetworkID(ld->getOriginalNetworkId());
dvb_ref.setServiceID(ld->getServiceId());
const PrivateDataByteVector *privateData = ld->getPrivateDataBytes();
- dvb_ref.name = convertDVBUTF8((const unsigned char*)&((*privateData)[0]), privateData->size(),
0
, tsidonid);
+ dvb_ref.name = convertDVBUTF8((const unsigned char*)&((*privateData)[0]), privateData->size(),
1
, tsidonid);
m_linkage_services.push_back(ref);
}
break;
m_linkage_services.push_back(ref);
}
break;