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

Workaround for bug in Qt 5.4 that causes multiple close events to be delivered when using a keyboard shortcut to quit on OS X. Fixes #1440444 [ebook-viewer forgets state of ToC if closed by keyboard (Cmd-Q)](https://bugs.launchpad.net/calibre/+bug/1440444)

Browse Source
This commit is contained in:
Kovid Goyal 2015-04-05 08:29:56 +05:30
parent 147d11f1ea
commit 0a252c6692
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,6 +80,7 @@ class EbookViewer(MainWindow):
start_in_fullscreen=False): start_in_fullscreen=False):
MainWindow.__init__(self, debug_javascript) MainWindow.__init__(self, debug_javascript)
self.view.magnification_changed.connect(self.magnification_changed) self.view.magnification_changed.connect(self.magnification_changed)
self.closed = False
self.show_toc_on_open = False self.show_toc_on_open = False
self.current_book_has_toc = False self.current_book_has_toc = False
self.iterator = None self.iterator = None
@ -252,7 +253,11 @@ class EbookViewer(MainWindow):
QApplication.instance().quit() QApplication.instance().quit()
def closeEvent(self, e): def closeEvent(self, e):
if self.closed:
e.ignore()
return
if self.shutdown(): if self.shutdown():
self.closed = True
return MainWindow.closeEvent(self, e) return MainWindow.closeEvent(self, e)
else: else:
e.ignore() e.ignore()