From 35d62df8a79d50fb79f48d455458969e0792048f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 19 Apr 2015 10:25:57 +0530 Subject: [PATCH] Hide splash screen after UI init not before --- src/calibre/gui2/main.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index 5175fbe9b2..e93576d6df 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -207,10 +207,13 @@ class GuiRunner(QObject): main = self.main = Main(self.opts, gui_debug=self.gui_debug) if self.splash_screen is not None: self.splash_screen.show_message(_('Initializing user interface...')) - self.splash_screen.finish(main) - with gprefs: # Only write gui.json after initialization is complete - main.initialize(self.library_path, db, self.listener, self.actions) - self.splash_screen = None + try: + with gprefs: # Only write gui.json after initialization is complete + main.initialize(self.library_path, db, self.listener, self.actions) + finally: + if self.splash_screen is not None: + self.splash_screen.finish(main) + self.splash_screen = None if DEBUG: prints('Started up in %.2f seconds'%(time.time() - self.startup_time), 'with', len(db.data), 'books')