X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FTaskView.py;h=660fb2769a16b610e005c73b4916af537d534d2a;hp=633aae0d1cd6068ad2fe28bbcb58c640f8c447f2;hb=ba5fcab217438b995c1f903e0294b71d1411668b;hpb=24cfe420fd59098b062985d1c92410cbea93e014 diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py index 633aae0..660fb27 100644 --- a/lib/python/Screens/TaskView.py +++ b/lib/python/Screens/TaskView.py @@ -117,8 +117,8 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen): self["config"].hide() if self.settings.afterEvent.getValue() == "nothing": return - elif self.settings.afterEvent.getValue() == "close": - self.abort() + elif self.settings.afterEvent.getValue() == "close" and self.job.status == self.job.FINISHED: + self.close(False) from Screens.MessageBox import MessageBox if self.settings.afterEvent.getValue() == "deepstandby": if not Screens.Standby.inTryQuitMainloop: @@ -127,6 +127,12 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen): if not Screens.Standby.inStandby: Notifications.AddNotificationWithCallback(self.sendStandbyNotification, MessageBox, _("A sleep timer wants to set your\nDreambox to standby. Do that now?"), timeout = 20) + def checkNotifications(self): + InfoBarNotifications.checkNotifications(self) + if Notifications.notifications == []: + if self.settings.afterEvent.getValue() == "close" and self.job.status == self.job.FAILED: + self.close(False) + def sendStandbyNotification(self, answer): if answer: Notifications.AddNotification(Screens.Standby.Standby)