X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpython%2FScreens%2FTaskView.py;h=5dd744fac69e9c96bc3917bdbbb84798041ec2c2;hb=fc1dd11742a464ade58d161b25e9cf59f6998634;hp=78648602f8f7924004bed1f41c13e7edd7bc9301;hpb=892a18f6926fa4711d17a2e0442b293467e8963c;p=vuplus_dvbapp

diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index 7864860..5dd744f 100644
--- a/lib/python/Screens/TaskView.py
+++ b/lib/python/Screens/TaskView.py
@@ -2,6 +2,7 @@ from Screen import Screen
 from Components.ConfigList import ConfigListScreen
 from Components.config import config, ConfigSubsection, ConfigSelection, getConfigListEntry
 from Components.SystemInfo import SystemInfo
+from Components.Task import job_manager
 from InfoBarGenerics import InfoBarNotifications
 import Screens.Standby
 from Tools import Notifications
@@ -108,16 +109,19 @@ class JobView(InfoBarNotifications, Screen, ConfigListScreen):
 			self.close(False)
 
 	def abort(self):
-		if self.job.status in (self.job.FINISHED, self.job.FAILED):
+		if self.job.status == self.job.NOT_STARTED:
+			job_manager.active_jobs.remove(self.job)
 			self.close(False)
-		if self["cancelable"].boolean == True:
+		elif self.job.status == self.job.IN_PROGRESS and self["cancelable"].boolean == True:
 			self.job.cancel()
+		else:
+			self.close(False)
 
 	def performAfterEvent(self):
 		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 +131,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)