X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/aed917161dda79ec6a53e20dbf0ee00a1affc4c0..5b87acc720b038d3ff8e9cd09b792342987a494a:/lib/dvb/scan.cpp

diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index 2457763a..76c71011 100644
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -40,6 +40,8 @@ int eDVBScan::isValidONIDTSID(int orbital_position, eOriginalNetworkID onid, eTr
 	case 0:
 	case 0x1111:
 		return 0;
+	case 0x13E:  // workaround for 11258H and 11470V on hotbird with same ONID/TSID (0x13E/0x578)
+		return orbital_position != 130 || tsid != 0x578;
 	case 1:
 		return orbital_position == 192;
 	case 0x00B1:
@@ -758,7 +760,7 @@ void eDVBScan::channelDone()
 			SCAN_eDebug("name '%s', provider_name '%s'", sname, pname);
 			service->m_service_name = convertDVBUTF8(sname);
 			service->genSortName();
-			service->m_provider_name = pname;
+			service->m_provider_name = convertDVBUTF8(pname);
 		}
 
 		if (!(m_flags & scanOnlyFree) || !m_pmt_in_progress->second.scrambled) {