restart previous running services in onClose event

[enigma2.git] / lib / python / Screens / InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 99979b13b8e3a3eaa3d9d0af9da5bd92e82046d1..05c5c98a91d0b27b17653d2c8d976a14843163ab 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -40,6 +40,7 @@ class InfoBar(InfoBarBase, InfoBarShowHide,
        Screen):
        
        ALLOW_SUSPEND = True
+       instance = None
 
        def __init__(self, session):
                Screen.__init__(self, session)
@@ -69,6 +70,11 @@ class InfoBar(InfoBarBase, InfoBarShowHide,
                        })
 
                self.current_begin_time=0
+               assert InfoBar.instance is None, "class InfoBar is a singleton class and just one instance of this class is allowed!"
+               InfoBar.instance = self
+
+       def __onClose(self):
+               InfoBar.instance = None
 
        def __eventInfoChanged(self):
                if self.execing:
@@ -146,6 +152,10 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
                self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.playService(service)
                self.returning = False
+               self.onClose.append(self.__onClose)
+
+       def __onClose(self):
+               self.session.nav.playService(self.lastservice)
 
        def leavePlayer(self):
                self.is_closing = True
@@ -165,14 +175,12 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
        def leavePlayerConfirmed(self, answer):
                answer = answer and answer[1]
                if answer == "quit":
-                       self.session.nav.playService(self.lastservice)
                        config.movielist.last_videodir.cancel()
                        self.close()
                elif answer == "movielist":
                        ref = self.session.nav.getCurrentlyPlayingServiceReference()
                        self.returning = True
                        self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
-                       self.session.nav.playService(self.lastservice)
                elif answer == "restart":
                        self.doSeek(0)