X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FTaskView.py;h=dafc26369374af89f9ccef5017b0abacf87be832;hp=fbbbed7fa720e425d74ed92d2617d3fbeb2d33a3;hb=4740f407833680f64142804134509350db42a079;hpb=ebcae6f0c3c52d2b446c82ef49a01847a678ed46

diff --git a/lib/python/Screens/TaskView.py b/lib/python/Screens/TaskView.py
index fbbbed7..dafc263 100755
--- 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,10 +109,13 @@ 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()