Merge from trunk

2025-07-09 03:04:10 -04:00 · 2010-06-25 17:52:58 +01:00 · 2010-06-25 17:52:58 +01:00 · 25894632dc
commit 25894632dc
parent 7cf3b2a263 adcd0c6b28
1 changed files with 6 additions and 0 deletions
--- a/src/calibre/gui2/device.py
+++ b/src/calibre/gui2/device.py
@ -76,10 +76,16 @@ class DeviceJob(BaseJob): # {{{
            self.job_done()

    def abort(self, err):
+        call_job_done = False
+        if self.run_state == self.WAITING:
+            self.start_work()
+            call_job_done = True
        self._aborted = True
        self.failed = True
        self._details = unicode(err)
        self.exception = err
+        if call_job_done:
+            self.job_done()

    @property
    def log_file(self):