fix default orbital_position setting in manual scan

[enigma2.git] / lib / python / Screens / ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index f6ef01cf030c009d6720456f00457ddfb6bab711..81985a83a06eaea51725e8373372cffb62ec91d0 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -190,8 +190,8 @@ class ScanSetup(ConfigListScreen, Screen):
                if nimmanager.getNimType(self.scan_nims.index) == nimmanager.nimType["DVB-S"]:
 
                        if self.scan_type.value == "single_transponder":
-                               self.systemEntry = getConfigListEntry(_('Transpondertype'), self.scan_sat.system)
-                               self.list.append(self.systemEntry)
+#                              self.systemEntry = getConfigListEntry(_('Transpondertype'), self.scan_sat.system)
+#                              self.list.append(self.systemEntry)
                                self.list.append(getConfigListEntry(_('Satellite'), self.scan_satselection[self.scan_nims.index]))
                                self.list.append(getConfigListEntry(_('Frequency'), self.scan_sat.frequency))
                                self.list.append(getConfigListEntry(_('Inversion'), self.scan_sat.inversion))
@@ -396,7 +396,7 @@ class ScanSetup(ConfigListScreen, Screen):
                        for slot in nimmanager.nimslots:
                                if (nimmanager.getNimType(slot.slotid) == nimmanager.nimType["DVB-S"]):
                                        print str(slot.slotid) + " : " + str(self.satList)
-                                       self.scan_satselection.append(getConfigSatlist(defaultSat["orbpos"],self.satList[slot.slotid]))
+                                       self.scan_satselection.append(getConfigSatlist(int(defaultSat["orbpos"]), self.satList[slot.slotid]))
                                else:
                                        self.scan_satselection.append(None)
 
@@ -483,8 +483,7 @@ class ScanSetup(ConfigListScreen, Screen):
                        elif self.scan_type.value == "single_satellite":
                                sat = self.satList[self.scan_nims.index][self.scan_satselection[self.scan_nims.index].index]
                                getInitialTransponderList(tlist, sat[0])
-                               if sat[2] & 1:
-                                       flags |= eComponentScan.scanNetworkSearch
+                               flags |= eComponentScan.scanNetworkSearch
                                tmp = self.scan_clearallservices.value
                                if tmp == "yes":
                                        flags |= eComponentScan.scanRemoveServices