From: Fraxinas <andreas.frisch@multimedia-labs.de>
Date: Wed, 18 Aug 2010 15:06:05 +0000 (+0200)
Subject: TaskView: correctly pop-up aborted/failed notifications in foreground
X-Git-Tag: 3.0.0~35
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/714ad2ad3ad21cebe0fe57400d462e4dcce8bb92?hp=6032ae6e6305ddb3c2d60581d0acb73793af0fc3

TaskView: correctly pop-up aborted/failed notifications in foreground
---

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)