X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fevent.cpp;h=949e150a7a4e1a562262bf43d9c5d074165ade44;hp=e78ddc4e1da2928bcd2000b5a7dc33a0528b2f56;hb=0a62b65175152c42976d4cb04fb7026d9f910915;hpb=9b87953a3079afb59b930bbe96e0e3aefda02595

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index e78ddc4..949e150 100644
--- 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)
 				{
-					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;
 				}
@@ -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.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;