From 9c3bc20cb82a052a44ca5a6000874b13459260c0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 25 Jun 2008 13:31:38 -0700 Subject: [PATCH] Fix #817 --- src/calibre/gui2/lrf_renderer/main.py | 2 +- src/calibre/gui2/main_window.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/lrf_renderer/main.py b/src/calibre/gui2/lrf_renderer/main.py index 6dd5722bd9..2fc4222a8f 100644 --- a/src/calibre/gui2/lrf_renderer/main.py +++ b/src/calibre/gui2/lrf_renderer/main.py @@ -285,7 +285,7 @@ def normalize_settings(parser, opts): for opt in parser.option_list: if not opt.dest: continue - if getattr(opts, opt.dest) == opt.default: + if getattr(opts, opt.dest) == opt.default and hasattr(saved_opts, opt.dest): continue setattr(saved_opts, opt.dest, getattr(opts, opt.dest)) return saved_opts diff --git a/src/calibre/gui2/main_window.py b/src/calibre/gui2/main_window.py index 66987228d1..b0ddc0a72d 100644 --- a/src/calibre/gui2/main_window.py +++ b/src/calibre/gui2/main_window.py @@ -36,7 +36,7 @@ class MainWindow(QMainWindow): def __init__(self, opts, parent=None): QMainWindow.__init__(self, parent) - if opts.redirect: + if getattr(opts, 'redirect', False): self.__console_redirect = DebugWindow(self) sys.stdout = sys.stderr = self.__console_redirect self.__console_redirect.show()