diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index 34db096dd16..86a540950c1 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -143,12 +143,12 @@ def movieSelected(self, service): if service is None: if ref and not self.session.nav.getCurrentlyPlayingServiceOrGroup(): self.session.nav.playService(ref) - elif service.valid(): + elif isinstance(service, bool) and service: + self.showMovies() + else: from Components.ParentalControl import parentalControl if parentalControl.isServicePlayable(service, self.openMoviePlayer): self.openMoviePlayer(service) - elif service is True: - self.showMovies() def openMoviePlayer(self, ref): self.session.open(MoviePlayer, ref, slist=self.servicelist, lastservice=self.session.nav.getCurrentlyPlayingServiceOrGroup(), infobar=self) @@ -536,15 +536,15 @@ def showMovies(self): self.movieselection_dlg = self.session.openWithCallback(self.movieSelected, Screens.MovieSelection.MovieSelection, ref) def movieSelected(self, service): - if service is not None and service.valid(): + if isinstance(service, bool) and service: + self.showMovies() + elif service is not None: if self.cur_service and self.cur_service != service: resumePointsInstance.setResumePoint(self.session) self.cur_service = service self.is_closing = False self.session.nav.playService(service) self.returning = False - elif service is True: - self.showMovies() elif self.returning: self.close() else: