X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8a951b87cc4f6d4db0f1c3c9113a4c0943971ef2..d97c5ff00f3017ac656be9608307c002b8bc50b0:/Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 06d47ac4..7b1deb03 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -7,8 +7,6 @@ import SleepTimer
 import NavigationInstance
 import ServiceReference
 
-from time import time
-
 # TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
 class Navigation:
 	def __init__(self):
@@ -42,24 +40,27 @@ class Navigation:
 
 	def playService(self, ref, checkParentalControl = True):
 		oldref = self.currentlyPlayingServiceReference
+		if ref and oldref and ref == oldref:
+			print "ignore request to play already running service"
+			return 0
 		print "playing", ref and ref.toString()
 		self.currentlyPlayingServiceReference = None
 		self.currentlyPlayingService = None
 		if ref is None:
 			self.stopService()
 			return 0
-		if not checkParentalControl or parentalControl.isServicePlayable(ref.toCompareString(), boundFunction(self.playService, checkParentalControl = False)):
+		if not checkParentalControl or parentalControl.isServicePlayable(ref, boundFunction(self.playService, checkParentalControl = False)):
 			if ref.flags & eServiceReference.isGroup:
 				if not oldref:
 					oldref = eServiceReference()
 				playref = getBestPlayableServiceReference(ref, oldref)
-				if not playref or (checkParentalControl and not parentalControl.isServicePlayable(playref.toCompareString(), boundFunction(self.playService, checkParentalControl = False))):
+				if not playref or (checkParentalControl and not parentalControl.isServicePlayable(playref, boundFunction(self.playService, checkParentalControl = False))):
 					self.stopService()
 					return 0
 			else:
 				playref = ref
 			if self.pnav and not self.pnav.playService(playref):
-				self.currentlyPlayingServiceReference = ref
+				self.currentlyPlayingServiceReference = playref
 				return 0
 		else:
 			self.stopService()