X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0b891b6bb8643fc0a82025fa5227caf61368ee8c..01897d6c61781861929b773238c8a6251df49629:/Navigation.py?ds=sidebyside

diff --git a/Navigation.py b/Navigation.py
index 0262a465..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):
@@ -51,18 +49,18 @@ class Navigation:
 		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()