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

Check for deletion in worker thread before emitting signal

Browse Source
This commit is contained in:
Kovid Goyal 2022-01-03 21:23:13 +05:30
parent 68e16a0d12
commit ec72e4f39d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@ from hashlib import sha256
from qt.core import ( from qt.core import (
QApplication, QCursor, QDockWidget, QEvent, QMainWindow, QMenu, QMimeData, QApplication, QCursor, QDockWidget, QEvent, QMainWindow, QMenu, QMimeData,
QModelIndex, QPixmap, Qt, QTimer, QToolBar, QUrl, QVBoxLayout, QWidget, QModelIndex, QPixmap, Qt, QTimer, QToolBar, QUrl, QVBoxLayout, QWidget,
pyqtSignal pyqtSignal, sip
) )
from threading import Thread from threading import Thread
@ -503,12 +503,15 @@ class EbookViewer(MainWindow):
try: try:
ans = prepare_book(pathtoebook, force=reload_book, prepare_notify=self.prepare_notify) ans = prepare_book(pathtoebook, force=reload_book, prepare_notify=self.prepare_notify)
except WorkerError as e: except WorkerError as e:
if not sip.isdeleted(self):
self.book_prepared.emit(False, {'exception': e, 'tb': e.orig_tb, 'pathtoebook': pathtoebook}) self.book_prepared.emit(False, {'exception': e, 'tb': e.orig_tb, 'pathtoebook': pathtoebook})
except Exception as e: except Exception as e:
import traceback import traceback
if not sip.isdeleted(self):
self.book_prepared.emit(False, {'exception': e, 'tb': traceback.format_exc(), 'pathtoebook': pathtoebook}) self.book_prepared.emit(False, {'exception': e, 'tb': traceback.format_exc(), 'pathtoebook': pathtoebook})
else: else:
performance_monitor('prepared emitted') performance_monitor('prepared emitted')
if not sip.isdeleted(self):
self.book_prepared.emit(True, {'base': ans, 'pathtoebook': pathtoebook, 'open_at': open_at, 'reloaded': reload_book}) self.book_prepared.emit(True, {'base': ans, 'pathtoebook': pathtoebook, 'open_at': open_at, 'reloaded': reload_book})
def prepare_notify(self): def prepare_notify(self):