X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8d8294b4b354436adde202604fffb55c181d686c..47c79edd46ef8d5cf7da20dd4e376d70c55b6243:/lib/dvb/scan.cpp

diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp
index 11b4e7c6..2be8a66d 100644
--- a/lib/dvb/scan.cpp
+++ b/lib/dvb/scan.cpp
@@ -11,6 +11,7 @@
 #include <lib/dvb/scan.h>
 #include <lib/dvb/frontend.h>
 #include <lib/base/eerror.h>
+#include <lib/base/estring.h>
 #include <errno.h>
 
 #define SCAN_eDebug(x...) eDebug(x)
@@ -68,11 +69,12 @@ void eDVBScan::stateChange(iDVBChannel *ch)
 	{
 		startFilter();
 		m_channel_state = state;
-	} else if (state == iDVBChannel::state_unavailable)
+	} else if (state == iDVBChannel::state_failed)
 	{
 		m_ch_unavailable.push_back(m_ch_current);
 		nextChannel();
 	}
+			/* unavailable will timeout, anyway. */
 }
 
 RESULT eDVBScan::nextChannel()
@@ -386,9 +388,9 @@ RESULT eDVBScan::processSDT(eDVBNamespace dvbnamespace, const ServiceDescription
 			case SERVICE_DESCRIPTOR:
 			{
 				ServiceDescriptor &d = (ServiceDescriptor&)**desc;
-				SCAN_eDebug("name '%s', provider_name '%s'", d.getServiceName().c_str(), d.getServiceProviderName().c_str());
-				service->m_service_name = d.getServiceName();
-				service->m_provider_name = d.getServiceProviderName();
+				service->m_service_name = convertDVBUTF8(d.getServiceName());
+				service->m_provider_name = convertDVBUTF8(d.getServiceProviderName());
+				SCAN_eDebug("name '%s', provider_name '%s'", service->m_service_name.c_str(), service->m_provider_name.c_str());
 				break;
 			}
 			case CA_IDENTIFIER_DESCRIPTOR: