show reasons for bsodFatal

[enigma2.git] / Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 0262a4652f780fc4cc2488d5171d577e6a571ff8..7b1deb030d049b6ed9dad5223f4c6149611c5d45 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -7,8 +7,6 @@ import SleepTimer
 import NavigationInstance
 import ServiceReference
 
 import NavigationInstance
 import ServiceReference
 

-from time import time
-

 # TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
 class Navigation:
        def __init__(self):
 # 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 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 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.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()
                                return 0
                else:
                        self.stopService()