tuse the parent config instance when daemon starts a window - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 93c468504eda1f6466c72a337437cc3858f22ace
DIR parent 3e4d332a4c8208f20d0051e827ee7a94988772b4
HTML Author: ThomasV <thomasv@electrum.org>
Date: Wed, 2 Sep 2015 09:55:45 +0200
use the parent config instance when daemon starts a window
Diffstat:
M electrum | 7 ++++---
M gui/qt/__init__.py | 3 ---
2 files changed, 4 insertions(+), 6 deletions(-)
---
DIR diff --git a/electrum b/electrum
t@@ -296,13 +296,14 @@ class ClientThread(util.DaemonThread):
cmd = config.get('cmd')
if cmd == 'gui':
if self.server.gui:
- if hasattr(server.gui, 'new_window'):
- self.server.gui.new_window(config)
+ if hasattr(server.gui, 'load_wallet_file'):
+ path = config.get_wallet_path()
+ self.server.gui.load_wallet_file(path)
response = "ok"
else:
response = "error: current GUI does not support multiple windows"
else:
- response = "error: Electrum daemon is running"
+ response = "Error: Electrum is running in daemon mode. Please stop the daemon first."
elif cmd == 'daemon':
sub = config.get('subcommand')
assert sub in ['start', 'stop', 'status']
DIR diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py
t@@ -113,9 +113,6 @@ class ElectrumGui:
for window in self.windows:
window.close()
- def new_window(self, config):
- self.app.emit(SIGNAL('new_window'), config)
-
def load_wallet_file(self, path):
self.app.emit(SIGNAL('new_window'), self.config, path)