From 37a8e070153dcfebf5650587fb2bcc0583afc489 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 25 Aug 2009 15:43:19 -0600 Subject: [PATCH] Make error messages about failed conversion jobs non-modal. Fixes #3273 (Calibre Shuts Down). --- src/calibre/gui2/main.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index 19e77d211c..154b6e859a 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -1578,12 +1578,14 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): def job_exception(self, job): try: if 'calibre.ebooks.DRMError' in job.details: - error_dialog(self, _('Conversion Error'), + d = error_dialog(self, _('Conversion Error'), _('

Could not convert: %s

It is a ' 'DRMed book. You must first remove the ' 'DRM using 3rd party tools.')%\ (job.description.split(':')[-1], - 'http://wiki.mobileread.com/wiki/DRM')).exec_() + 'http://wiki.mobileread.com/wiki/DRM')) + d.setModal(False) + d.show() return except: pass @@ -1593,9 +1595,11 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): prints(job.details, file=sys.stderr) except: pass - error_dialog(self, _('Conversion Error'), + d = error_dialog(self, _('Conversion Error'), _('Failed')+': '+unicode(job.description), - det_msg=job.details).exec_() + det_msg=job.details) + d.setModal(False) + d.show() def initialize_database(self):