restart previous running services in onClose event

[enigma2.git] / lib / python / Plugins / SystemPlugins / Satfinder / plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index 50182a9e3b08c4528aaf42b30e93b5b14e6d3319..d6d967d25742b8f1bba8bd46206ac9b87355be2f 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -1,4 +1,4 @@
-from enigma import eTimer, eDVBResourceManager,\
+from enigma import eDVBResourceManager,\
        eDVBFrontendParametersSatellite, eDVBFrontendParameters
 
 from Screens.Screen import Screen
@@ -69,11 +69,11 @@ class Satfinder(ScanSetup):
                        <widget source="Frontend" render="Progress" position="85,307" size="200,22" >
                                <convert type="FrontendInfo">BER</convert>
                        </widget>
-                       <widget source="Frontend" render="Pixmap" pixmap="key_green-fs8.png" position="295,330" zPosition="4" size="28,20" alphatest="on" >
+                       <widget source="Frontend" render="Pixmap" pixmap="skin_default/buttons/key_green.png" position="295,330" zPosition="4" size="28,20" alphatest="on" >
                                <convert type="FrontendInfo">LOCK</convert>
                        <convert type="ConditionalShowHide" />
                        </widget>
-                       <widget source="Frontend" render="Pixmap" pixmap="key_red-fs8.png" position="295,330" zPosition="4" size="28,20" alphatest="on" >
+                       <widget source="Frontend" render="Pixmap" pixmap="skin_default/buttons/key_red.png" position="295,330" zPosition="4" size="28,20" alphatest="on" >
                                <convert type="FrontendInfo">LOCK</convert>
                        <convert type="ConditionalShowHide">Invert</convert>
                        </widget>
@@ -115,6 +115,10 @@ class Satfinder(ScanSetup):
                self["introduction"].setText("")
                self["Frontend"] = FrontendStatus(frontend_source = lambda : self.frontend, update_interval = 100)
                self.initcomplete = True
+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               self.session.nav.playService(self.oldref)
 
        def createSetup(self):
                self.typeOfTuningEntry = None
@@ -189,6 +193,8 @@ class Satfinder(ScanSetup):
                                        pol = "CL"
                                elif x[3] == 3:
                                        pol = "CR"
+                               else:
+                                       pol = "??"
                                if x[4] == 0:
                                        fec = "FEC_AUTO"
                                elif x[4] == 1:
@@ -201,10 +207,18 @@ class Satfinder(ScanSetup):
                                        fec = "FEC_5_6"
                                elif x[4] == 5:
                                        fec = "FEC_7_8"
-                               elif x[4] == 5:
-                                       fec = "FEC_8_9"
                                elif x[4] == 6:
+                                       fec = "FEC_8_9"
+                               elif x[4] == 7:
+                                       fec = "FEC_3_5"
+                               elif x[4] == 8:
+                                       fec = "FEC_4_5"
+                               elif x[4] == 9:
+                                       fec = "FEC_9_10"
+                               elif x[4] == 15:
                                        fec = "FEC_None"
+                               else:
+                                       fec = "FEC_Unknown"
                                list.append(str(x[1]) + "," + str(x[2]) + "," + pol + "," + fec)
                        self.tuning_transponder = ConfigSelection(choices = list)
                        self.tuning_transponder.addNotifier(self.retune, initial_call = False)
@@ -217,7 +231,8 @@ class Satfinder(ScanSetup):
                        if self.frontend:
                                self.frontend = None
                                del self.raw_channel
-                       self.session.nav.playService(self.oldref)
+               else:
+                       self.oldref = None
                self.close(None)
 
        def keyCancel(self):