Merge commit 'origin/bug_218_simplify_networkwizard'

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 62480b5..156f778 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -347,6 +347,7 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
                new_configured_sats = nimmanager.getConfiguredSats()
                self.unconfed_sats = old_configured_sats - new_configured_sats
                self.satpos_to_remove = None
+               self.restoreService(_("Zap back to service before tuner setup?"))
                self.deleteConfirmed((None, "no"))
 
        def deleteConfirmed(self, confirmed):
@@ -376,8 +377,6 @@ class NimSetup(Screen, ConfigListScreen, ServiceStopScreen):
                        if confirmed[1] == "yestoall" or confirmed[1] == "notoall":
                                self.deleteConfirmed(confirmed)
                        break
-               if not self.satpos_to_remove:
-                       self.restoreService(_("Zap back to service before tuner setup?"))
                
        def __init__(self, session, slotid):
                Screen.__init__(self, session)

diff --git a/lib/python/Screens/ServiceStopScreen.py b/lib/python/Screens/ServiceStopScreen.py
index 3b3dda8..628a93a 100644 (file)
--- a/lib/python/Screens/ServiceStopScreen.py
+++ b/lib/python/Screens/ServiceStopScreen.py
@@ -6,13 +6,26 @@ class ServiceStopScreen:
                        self.session
                except:
                        print "[ServiceStopScreen] ERROR: no self.session set"
-                       
+
                self.oldref = None
                self.onClose.append(self.__onClose)
                
+       def pipAvailable(self):
+               # pip isn't available in every state of e2
+               try:
+                       self.session.pipshown
+                       pipavailable = True
+               except:
+                       pipavailable = False
+               return pipavailable
+               
        def stopService(self):          
                self.oldref = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.stopService()
+               if self.pipAvailable():
+                       if self.session.pipshown: # try to disable pip
+                               self.session.pipshown = False
+                               del self.session.pip
                
        def __onClose(self):
                self.session.nav.playService(self.oldref)