projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pootle-import'
[vuplus_dvbapp]
/
lib
/
python
/
Screens
/
TaskView.py
diff --git
a/lib/python/Screens/TaskView.py
b/lib/python/Screens/TaskView.py
index
660fb27
..
6e1b752
100644
(file)
--- a/
lib/python/Screens/TaskView.py
+++ b/
lib/python/Screens/TaskView.py
@@
-108,10
+108,10
@@
class JobView(InfoBarNotifications, Screen, ConfigListScreen):
self.close(False)
def abort(self):
self.close(False)
def abort(self):
- if self.job.status in (self.job.FINISHED, self.job.FAILED):
- self.close(False)
- if self["cancelable"].boolean == True:
+ if self.job.status == self.job.IN_PROGRESS and self["cancelable"].boolean == True:
self.job.cancel()
self.job.cancel()
+ else:
+ self.close(False)
def performAfterEvent(self):
self["config"].hide()
def performAfterEvent(self):
self["config"].hide()