aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-11-07 14:28:36 +0100
committerghost <andreas.monzner@multimedia-labs.de>2009-11-07 14:28:36 +0100
commitf3d145e1d246e25b3fda5796216552ccbbdde1f0 (patch)
treebc2af21aaec192ebd849cbd2522dbf0044b794f8 /lib/python/Screens
parent2fded86dd8d04e121436ec88ab8d1a967a70628f (diff)
parent513239a74d5abdc0c22fdd8d4dcb892703ef8c27 (diff)
downloadenigma2-f3d145e1d246e25b3fda5796216552ccbbdde1f0.tar.gz
enigma2-f3d145e1d246e25b3fda5796216552ccbbdde1f0.zip
Merge branch 'bug_258_sorting_of_configsatlist' into experimental
Diffstat (limited to 'lib/python/Screens')
-rw-r--r--lib/python/Screens/ScanSetup.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index aed90268..d0af8f7e 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -729,10 +729,11 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
assert len(self.scan_satselection) > index_to_scan
nimsats = self.satList[index_to_scan]
- orbpos = self.scan_satselection[index_to_scan].getOrbitalPosition()
+ selsatidx = self.scan_satselection[index_to_scan].index
# however, the satList itself could be empty. in that case, "index" is 0 (for "None").
if len(nimsats):
+ orbpos = nimsats[selsatidx][0]
if self.scan_sat.system.value == eDVBFrontendParametersSatellite.System_DVB_S:
fec = self.scan_sat.fec.value
else:
@@ -750,7 +751,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
self.scan_sat.pilot.value)
removeAll = False
elif self.scan_type.value == "single_satellite":
- sat = self.scan_satselection[index_to_scan].getSat()
+ sat = self.satList[index_to_scan][self.scan_satselection[index_to_scan].index]
getInitialTransponderList(tlist, sat[0])
elif self.scan_type.value.find("multisat") != -1:
SatList = nimmanager.getSatListForNim(index_to_scan)