X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/21f7d1f555aaee934524bf6181b9941c642246a8..8fd90e2e7a3097863bef72cf9e3dca656683988f:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 8f400d24..41df2475 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,4 +1,4 @@
-from Tools.Profile import profile, profile_final
+from Tools.Profile import profile
 
 from Screen import Screen
 
@@ -152,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
@@ -171,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)