aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens
diff options
context:
space:
mode:
authorFraxinas <andreas.frisch@multimedia-labs.de>2010-08-18 17:06:05 +0200
committerghost <andreas.monzner@multimedia-labs.de>2010-10-06 23:54:51 +0200
commit714ad2ad3ad21cebe0fe57400d462e4dcce8bb92 (patch)
tree43edfad3533a6ebc022847ad11af961da7d40401 /lib/python/Screens
parent6032ae6e6305ddb3c2d60581d0acb73793af0fc3 (diff)
downloadenigma2-714ad2ad3ad21cebe0fe57400d462e4dcce8bb92.tar.gz
enigma2-714ad2ad3ad21cebe0fe57400d462e4dcce8bb92.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)