aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens
diff options
context:
space:
mode:
authorFraxinas <andreas.frisch@multimedia-labs.de>2010-08-18 17:06:05 +0200
committerFraxinas <andreas.frisch@multimedia-labs.de>2010-08-18 17:06:05 +0200
commit9bb563148acaa6198c21d333844471c7c90c4fd7 (patch)
treeecf6e1a221a72cb030d23784a2e03b09a19ca0ef /lib/python/Screens
parent892a18f6926fa4711d17a2e0442b293467e8963c (diff)
downloadenigma2-9bb563148acaa6198c21d333844471c7c90c4fd7.tar.gz
enigma2-9bb563148acaa6198c21d333844471c7c90c4fd7.zip
TaskView: correctly pop-up aborted/failed notifications in foreground
Diffstat (limited to 'lib/python/Screens')
-rw-r--r--lib/python/Screens/TaskView.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index 78648602..660fb276 100644
--- a/lib/python/Screens/TaskView.py
+++ b/lib/python/Screens/TaskView.py
@@ -117,7 +117,7 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
self["config"].hide()
if self.settings.afterEvent.getValue() == "nothing":
return
- elif self.settings.afterEvent.getValue() == "close":
+ 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":
@@ -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)