By Anders Holst:

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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index bd9ea182a7040e62e02eec0a067ee07b70c8d4cb..be1407d39a69b44ca589e4d55f9af1a2b859d405 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -47,6 +47,8 @@ class InfoBar(InfoBarBase, InfoBarShowHide,
                                "showTv": (self.showTv, _("Show the tv player...")),
                        }, prio=2)
                
+               self.allowPiP = True
+               
                for x in HelpableScreen, \
                                InfoBarBase, InfoBarShowHide, \
                                InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \
@@ -126,7 +128,7 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
                InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
                InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
                InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin,
-               InfoBarServiceErrorPopupSupport, InfoBarExtensions, InfoBarPlugins):
+               InfoBarServiceErrorPopupSupport, InfoBarExtensions, InfoBarPlugins, InfoBarPiP):
 
        ENABLE_RESUME_SUPPORT = True
        ALLOW_SUSPEND = True
@@ -139,17 +141,19 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
                                "leavePlayer": (self.leavePlayer, _("leave movie player..."))
                        })
                
+               self.allowPiP = False
+               
                for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \
                                InfoBarBase, InfoBarSeek, InfoBarShowMovies, \
                                InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \
                                InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \
                                InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \
                                InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport, InfoBarExtensions, \
-                               InfoBarPlugins:
+                               InfoBarPlugins, InfoBarPiP:
                        x.__init__(self)
 
-               self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
-               self.session.nav.playService(service)
+               self.lastservice = session.nav.getCurrentlyPlayingServiceReference()
+               session.nav.playService(service)
                self.returning = False
                self.onClose.append(self.__onClose)
 
@@ -208,7 +212,6 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \
                                        return
 
                if answer in ("quit", "quitanddeleteconfirmed"):
-                       config.movielist.last_videodir.cancel()
                        self.close()
                elif answer == "movielist":
                        ref = self.session.nav.getCurrentlyPlayingServiceReference()