don't die when entering ScanSetup

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

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 2b25cce73eb2c8f66a4303f7322452ad11e6738f..30d5bd8a55029e977e0a7806ad35066f5fd19e16 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -61,7 +61,8 @@ class ScanSetup(Screen):
        def updateSatList(self):
                self.satList = []
                for slot in nimmanager.nimslots:
-                       self.satList.append(nimmanager.getSatListForNim(slot.slotid))
+                       if (nimmanager.getNimType(slot.slotid) == nimmanager.nimType["DVB-S"]):
+                               self.satList.append(nimmanager.getSatListForNim(slot.slotid))
 
        def createSetup(self):
                self.list = []
@@ -182,7 +183,8 @@ class ScanSetup(Screen):
                        config.scan.satselection = []
                        slotid = 0
                        for slot in nimmanager.nimslots:
-                               config.scan.satselection.append(configElement_nonSave("config.scan.satselection[" + str(slot.slotid) + "]", configSatlist, 0, self.satList[slot.slotid]))
+                               if (nimmanager.getNimType(slot.slotid) == nimmanager.nimType["DVB-S"]):
+                                       config.scan.satselection.append(configElement_nonSave("config.scan.satselection[" + str(slot.slotid) + "]", configSatlist, 0, self.satList[slot.slotid]))
 
        def keyLeft(self):
                self["config"].handleKey(config.key["prevElement"])
@@ -283,7 +285,7 @@ class ScanSetup(Screen):
                for x in self["config"].list:
                        x[1].save()
 
-               feid = 0 # insert correct frontend id here (should be user-selectable)
+               feid = config.scan.nims.value
                # flags |= eComponentScan.scanSearchBAT
                self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, feid, flags)