work on web interface

[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 861db62773b465f87f6cec60d1a1f8a72f529366..d915b91f6a71f5d1e658885e84d243f9733b638b 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -77,14 +77,22 @@ class Satfinder(ScanSetup):
        def __init__(self, session, feid):
                self.initcomplete = False
                self.feid = feid
-
+               self.oldref = None
+               
                if not self.openFrontend():
-                       self.frontend = None
+                       self.oldref = session.nav.getCurrentlyPlayingServiceReference()
+                       session.nav.stopService() # try to disable foreground service
+                       if not self.openFrontend():
+                               if session.pipshown: # try to disable pip
+                                       session.pipshown = False
+                                       del session.pip
+                                       if not self.openFrontend():
+                                               self.frontend = None # in normal case this should not happen
+                                               self.getFrontend = None
 
                ScanSetup.__init__(self, session)
-               self.session.nav.stopService()
                self.tuner = Tuner(self.frontend)
-               
+
                self["snr"] = Label()
                self["agc"] = Label()
                self["ber"] = Label()
@@ -104,6 +112,7 @@ class Satfinder(ScanSetup):
                self.statusTimer.start(50, False)
 
                self.initcomplete = True
+               self.session = session
                
        def updateStatus(self):
                self["snr_percentage"].update()
@@ -129,7 +138,7 @@ class Satfinder(ScanSetup):
                        self.list.append(getConfigListEntry(_('Symbol Rate'), config.scan.sat.symbolrate))
                        self.list.append(getConfigListEntry(_("Polarity"), config.scan.sat.polarization))
                        self.list.append(getConfigListEntry(_("FEC"), config.scan.sat.fec))
-               elif config.tuning.transponder and self.currentConfigSelectionElement(config.tuning.type) == "predefined_transponder":
+               elif config.tuning.transponder and currentConfigSelectionElement(config.tuning.type) == "predefined_transponder":
                        self.list.append(getConfigListEntry(_("Transponder"), config.tuning.transponder))
                self["config"].list = self.list
                self["config"].l.setList(self.list)
@@ -215,6 +224,11 @@ class Satfinder(ScanSetup):
                self.retune(config.tuning.type)
 
        def keyCancel(self):
+               if self.oldref:
+                       if self.frontend:
+                               self.frontend = None
+                               del self.raw_channel
+                       self.session.nav.playService(self.oldref)
                self.close(None)
                
        def tune(self, transponder):
@@ -263,5 +277,6 @@ def SatfinderMain(session, **kwargs):
                        else:
                                session.open(MessageBox, _("No tuner is configured for use with a diseqc positioner!"), MessageBox.TYPE_ERROR)
 
+
 def Plugins(**kwargs):
        return PluginDescriptor(name="Satfinder", description="Helps setting up your dish", where = PluginDescriptor.WHERE_PLUGINMENU, fnc=SatfinderMain)