From: hschang <chang@dev3>
Date: Thu, 16 Apr 2015 02:39:47 +0000 (+0900)
Subject: [ScanSetup] fix TT3L10 automatic scan problem.
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=6c77bc054d80f13972ad37ff34e958ca49e7e7c1

[ScanSetup] fix TT3L10 automatic scan problem.
---

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 3ee0dbe..4103f84 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -210,16 +210,14 @@ class CableTransponderSearchSupport:
 			        nim_name = nim_name.split(' ')[-1][4:-1]
 			        if nim_name == 'TT3L10':
 			            try:
-			                device_id = GetDeviceId('TT3L10', nimIdx)
+			                device_id = GetDeviceId('TT3L10', nim_idx)
 			                device_id = "--device=%s" % (device_id)
-			            except: device_id = ""
-			            if device_id == "":
-			                return "tda1002x"
-#			        print nimIdx, nim_name, cable_autoscan_nimtype[nim_name], device_id
-			        try:
-				        command = "%s %s" % (cable_autoscan_nimtype[nim_name], device_id)
-				        return command
-			       	except: pass
+			            except Exception, err:
+			                print "GetCommand ->", err
+			                device_id = "--device=0"
+#			            print nim_idx, nim_name, cable_autoscan_nimtype[nim_name], device_id
+			        command = "%s %s" % (cable_autoscan_nimtype[nim_name], device_id)
+			        return command
 		    except Exception, err:
 		    	print "GetCommand ->", err
 		    return "tda1002x"
@@ -443,16 +441,14 @@ class TerrestrialTransponderSearchSupport:
 				nim_name = nim_name.split(' ')[-1][4:-1]
 				if nim_name == 'TT3L10':
 					try:
-						device_id = GetDeviceId('TT3L10', nimIdx)
+						device_id = GetDeviceId('TT3L10', nim_idx)
 						device_id = "--device %s" % (device_id)
-					except: device_id = ""
-					if device_id == "":
-						return "ssh108_t2_scan"
-#					print nimIdx, nim_name, terrestrial_autoscan_nimtype[nim_name], device_id
-				try:
-					command = "%s %s" % (terrestrial_autoscan_nimtype[nim_name], device_id)
-					return command
-				except: pass
+					except Exception, err:
+						print "terrestrialTransponderGetCmd ->", err
+						device_id = "--device 0"
+#					print nim_idx, nim_name, terrestrial_autoscan_nimtype[nim_name], device_id
+				command = "%s %s" % (terrestrial_autoscan_nimtype[nim_name], device_id)
+				return command
 		except Exception, err:
 			print "terrestrialTransponderGetCmd ->", err
 		return ""