diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index c47c821913..73f7f3839d 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -121,7 +121,8 @@ class GuiRunner(QObject): def start_gui(self): from calibre.gui2.ui import Main - main = Main(self.library_path, self.db, self.listener, self.opts, self.actions) + main = Main(self.opts) + main.initialize(self.library_path, self.db, self.listener, self.actions) add_filesystem_book = partial(main.add_filesystem_book, allow_device=False) sys.excepthook = main.unhandled_exception if len(self.args) > 1: diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 8bc85e7195..5f7d4b76cd 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -127,13 +127,18 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): pixmap_to_data(pixmap)) self.last_time = datetime.datetime.now() - def __init__(self, library_path, db, listener, opts, actions, parent=None): + + def __init__(self, opts, parent=None): + MainWindow.__init__(self, opts, parent) + self.opts = opts + + def initialize(self, library_path, db, listener, actions): + opts = self.opts self.last_time = datetime.datetime.now() self.preferences_action, self.quit_action = actions self.library_path = library_path self.spare_servers = [] self.must_restart_before_config = False - MainWindow.__init__(self, opts, parent) # Initialize fontconfig in a separate thread as this can be a lengthy # process if run for the first time on this machine from calibre.utils.fonts import fontconfig