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

Fix #943056 (Download metadata notice crashes on ESC)

Browse Source
This commit is contained in:
Kovid Goyal 2012-02-29 10:01:21 +05:30
parent cdcda1b0e7
commit b2f10c99ca
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/gui2/dialogs/message_box.py
View File

@ -172,7 +172,7 @@ class ProceedNotification(MessageBox): # {{{
:param payload: Arbitrary object, passed to callback :param payload: Arbitrary object, passed to callback
:param html_log: An HTML or plain text log :param html_log: An HTML or plain text log
:param log_viewer_title: The title for the log viewer window :param log_viewer_title: The title for the log viewer window
:param title: The title fo rthis popup :param title: The title for this popup
:param msg: The msg to display :param msg: The msg to display
:param det_msg: Detailed message :param det_msg: Detailed message
''' '''
@ -182,7 +182,6 @@ class ProceedNotification(MessageBox): # {{{
self.payload = payload self.payload = payload
self.html_log = html_log self.html_log = html_log
self.log_viewer_title = log_viewer_title self.log_viewer_title = log_viewer_title
self.finished.connect(self.do_proceed)
self.vlb = self.bb.addButton(_('View log'), self.bb.ActionRole) self.vlb = self.bb.addButton(_('View log'), self.bb.ActionRole)
self.vlb.setIcon(QIcon(I('debug.png'))) self.vlb.setIcon(QIcon(I('debug.png')))
@ -205,9 +204,13 @@ class ProceedNotification(MessageBox): # {{{
# Ensure this notification is garbage collected # Ensure this notification is garbage collected
self.callback = self.cancel_callback = self.payload = None self.callback = self.cancel_callback = self.payload = None
self.setParent(None) self.setParent(None)
self.finished.disconnect()
self.vlb.clicked.disconnect() self.vlb.clicked.disconnect()
_proceed_memory.remove(self) _proceed_memory.remove(self)
def done(self, r):
self.do_proceed(r)
return MessageBox.done(self, r)
# }}} # }}}
class ErrorNotification(MessageBox): # {{{ class ErrorNotification(MessageBox): # {{{