Merge branch 'bug_258_sorting_of_configsatlist' into experimental

[enigma2.git] / lib / python / Components / NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 1dff777af3189fa1f4f404cfa1ecbbecbdda2702..5ca80ce7aa2372fb5879266b32fabb4a0c28e0d2 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -800,15 +800,15 @@ class NimManager:
                                dm = nim.diseqcMode.value
                                if dm in ("single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
                                        if nim.diseqcA.orbital_position != 3601:
                                dm = nim.diseqcMode.value
                                if dm in ("single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
                                        if nim.diseqcA.orbital_position != 3601:

-                                               list.append(nim.diseqcA.getSat())
+                                               list.append(self.satList[nim.diseqcA.index-1])

                                if dm in ("toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
                                        if nim.diseqcB.orbital_position != 3601:
                                if dm in ("toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"):
                                        if nim.diseqcB.orbital_position != 3601:

-                                               list.append(nim.diseqcB.getSat())
+                                               list.append(self.satList[nim.diseqcB.index-1])

                                if dm == "diseqc_a_b_c_d":
                                        if nim.diseqcC.orbital_position != 3601:
                                if dm == "diseqc_a_b_c_d":
                                        if nim.diseqcC.orbital_position != 3601:

-                                               list.append(nim.diseqcC.getSat())
+                                               list.append(self.satList[nim.diseqcC.index-1])

                                        if nim.diseqcD.orbital_position != 3601:
                                        if nim.diseqcD.orbital_position != 3601:

-                                               list.append(nim.diseqcD.getSat())
+                                               list.append(self.satList[nim.diseqcD.index-1])

                                if dm == "positioner":
                                        for x in self.satList:
                                                list.append(x)
                                if dm == "positioner":
                                        for x in self.satList:
                                                list.append(x)


@@ -940,7 +940,7 @@ def InitNimManager(nimmgr):
 
        lnb_choices = {
                "universal_lnb": _("Universal LNB"),
 
        lnb_choices = {
                "universal_lnb": _("Universal LNB"),

-#              "unicable": _("Unicable"),
+               "unicable": _("Unicable"),

                "c_band": _("C-Band"),
                "user_defined": _("User defined")}
 
                "c_band": _("C-Band"),
                "user_defined": _("User defined")}