X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fservice%2Fevent.cpp;h=2a4cb0d1fbaed478a90d0129f95a25fb9fb50df5;hp=e15eebfc979a01a7e79567f302b54fe4462c68ce;hb=fc1dd11742a464ade58d161b25e9cf59f6998634;hpb=dd76d3712ae3f422580c5462139302cfa2527dfd

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index e15eebf..2a4cb0d 100644
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -86,7 +86,7 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
 				int table=encodingHandler.getCountryCodeDefaultMapping(cc);
 				if (lang.empty())
 					lang = cc;  // use first found language
-				if (cc == lang)
+				if (!strncasecmp(lang.c_str(), cc.c_str(), 3))
 				{
 					m_event_name = convertDVBUTF8(replace_all(replace_all(sed->getEventName(), "\n", " "), "\t", " "), table, tsidonid);
 					m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid);
@@ -101,7 +101,7 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
 				int table=encodingHandler.getCountryCodeDefaultMapping(cc);
 				if (lang.empty())
 					lang = cc;  // use first found language
-				if (cc == lang)
+				if (!strncasecmp(lang.c_str(), cc.c_str(), 3))
 				{
 					m_extended_description += convertDVBUTF8(eed->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;