Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #3724 ("AttributeError" when canceling multiple book conversion)

Browse Source
This commit is contained in:
Kovid Goyal 2009-10-08 09:08:23 -06:00
parent 45b377040f
commit 588c71ba27
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/main.py
View File

@ -1200,6 +1200,8 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
self.library_view.model().db, book_ids, self.library_view.model().db, book_ids,
out_format=prefs['output_format'], args=(rows, previous, out_format=prefs['output_format'], args=(rows, previous,
self.book_converted)) self.book_converted))
if self.__bulk_queue is None:
return
num = len(self.__bulk_queue.book_ids) num = len(self.__bulk_queue.book_ids)
else: else:
jobs, changed, bad = convert_single_ebook(self, jobs, changed, bad = convert_single_ebook(self,

2
src/calibre/gui2/tools.py
View File

@ -105,7 +105,7 @@ def convert_bulk_ebook(parent, queue, db, book_ids, out_format=None, args=[]):
d = BulkConfig(parent, db, out_format) d = BulkConfig(parent, db, out_format)
if d.exec_() != QDialog.Accepted: if d.exec_() != QDialog.Accepted:
return jobs, changed, bad return None
output_format = d.output_format output_format = d.output_format
user_recs = cPickle.loads(d.recommendations) user_recs = cPickle.loads(d.recommendations)