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 viewer shutdown guard

Browse Source
This commit is contained in:
Kovid Goyal 2020-06-15 14:34:49 +05:30
parent 8e2ff38dd5
commit 7ed580cad4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/gui2/viewer/ui.py
View File

@ -90,7 +90,7 @@ class EbookViewer(MainWindow):
MainWindow.__init__(self, None) MainWindow.__init__(self, None)
self.annotations_saver = None self.annotations_saver = None
self.calibre_book_data_for_first_book = calibre_book_data self.calibre_book_data_for_first_book = calibre_book_data
self.shutting_down = self.close_forced = False self.shutting_down = self.close_forced = self.shutdown_done = False
self.force_reload = force_reload self.force_reload = force_reload
connect_lambda(self.book_preparation_started, self, lambda self: self.loading_overlay(_( connect_lambda(self.book_preparation_started, self, lambda self: self.loading_overlay(_(
'Preparing book for first read, please wait')), type=Qt.QueuedConnection) 'Preparing book for first read, please wait')), type=Qt.QueuedConnection)
@ -569,9 +569,9 @@ class EbookViewer(MainWindow):
if calibre_book_data is None: if calibre_book_data is None:
bld = self.current_book_data['book_library_details'] bld = self.current_book_data['book_library_details']
if bld is not None: if bld is not None:
amap = load_annotations_map_from_library(bld) lib_amap = load_annotations_map_from_library(bld)
if amap: if lib_amap:
for annot_type, annots in iteritems(self.calibre_book_data_for_first_book['annotations_map']): for annot_type, annots in iteritems(lib_amap):
merge_annotations(annots, amap) merge_annotations(annots, amap)
else: else:
for annot_type, annots in iteritems(calibre_book_data['annotations_map']): for annot_type, annots in iteritems(calibre_book_data['annotations_map']):
@ -652,6 +652,8 @@ class EbookViewer(MainWindow):
self.force_close() self.force_close()
def closeEvent(self, ev): def closeEvent(self, ev):
if self.shutdown_done:
return
if self.current_book_data and self.web_view.view_is_ready and not self.close_forced: if self.current_book_data and self.web_view.view_is_ready and not self.close_forced:
ev.ignore() ev.ignore()
if not self.shutting_down: if not self.shutting_down:
@ -659,8 +661,6 @@ class EbookViewer(MainWindow):
QTimer.singleShot(2000, self.force_close) QTimer.singleShot(2000, self.force_close)
self.web_view.prepare_for_close() self.web_view.prepare_for_close()
return return
if self.shutting_down:
return
self.shutting_down = True self.shutting_down = True
self.search_widget.shutdown() self.search_widget.shutdown()
try: try:
@ -673,5 +673,6 @@ class EbookViewer(MainWindow):
import traceback import traceback
traceback.print_exc() traceback.print_exc()
clean_running_workers() clean_running_workers()
self.shutdown_done = True
return MainWindow.closeEvent(self, ev) return MainWindow.closeEvent(self, ev)
# }}} # }}}