From 935a9a980d1d507dc7504af38e442c57d78420d9 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Fri, 30 Jan 2015 10:19:22 +0100 Subject: [PATCH] disable auo-connect is --server option is passed. fixes #992 --- electrum | 3 ++- lib/simple_config.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/electrum b/electrum index f30607bb..75e5e0a8 100755 --- a/electrum +++ b/electrum @@ -206,9 +206,10 @@ if __name__ == '__main__': for k, v in config_options.items(): if v is None: config_options.pop(k) + if config_options.get('server'): + config_options['auto_cycle'] = False set_verbosity(config_options.get('verbose')) - config = SimpleConfig(config_options) print_error("CA bundle:", requests.utils.DEFAULT_CA_BUNDLE_PATH, "found" if os.path.exists(requests.utils.DEFAULT_CA_BUNDLE_PATH) else "not found") diff --git a/lib/simple_config.py b/lib/simple_config.py index 0824c04e..b9ad42f4 100644 --- a/lib/simple_config.py +++ b/lib/simple_config.py @@ -110,7 +110,7 @@ class SimpleConfig(object): out = None with self.lock: out = self.read_only_options.get(key) - if not out: + if out is None: out = self.user_config.get(key, default) return out