small fix
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Sun, 7 Jan 2007 16:29:50 +0000 (16:29 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Sun, 7 Jan 2007 16:29:50 +0000 (16:29 +0000)
lib/python/Components/ParentalControl.py

index b9c31c4b9eccbe11aa78703e92818df5029f98c8..4bf18067750170a066e6d3af071a211da2299780 100644 (file)
@@ -63,7 +63,7 @@ class ParentalControl:
                        self.serviceLevel.remove(service)
                                
        def isServicePlayable(self, service, callback):
-               if not config.ParentalControl.configured.value:
+               if not config.ParentalControl.configured.value or not config.ParentalControl.setuppinactive.value:
                        return True
                #print "whitelist:", self.whitelist
                #print "blacklist:", self.blacklist