AaronFiore/electrum
1
0
Fork 0
Code Activity

don't try to open window if started in daemon mode

Browse Source
This commit is contained in:
ThomasV
2015-09-01 10:17:55 +02:00
parent 0fa38074de
commit 0e2db1e0ca
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum
View File

@@ -295,8 +295,11 @@ class ClientThread(util.DaemonThread):
config = SimpleConfig(config_options) config = SimpleConfig(config_options)
cmd = config.get('cmd') cmd = config.get('cmd')
if cmd == 'gui': if cmd == 'gui':
self.server.gui.new_window(config) if self.server.gui:
response = "ok" self.server.gui.new_window(config)
response = "ok"
else:
response = "Error: Electrum daemon is running"
elif cmd == 'daemon': elif cmd == 'daemon':
sub = config.get('subcommand') sub = config.get('subcommand')
assert sub in ['start', 'stop', 'status'] assert sub in ['start', 'stop', 'status']
@@ -340,6 +343,8 @@ class NetworkServer(util.DaemonThread):
self.lock = threading.RLock() self.lock = threading.RLock()
# each GUI is a client of the daemon # each GUI is a client of the daemon
self.clients = [] self.clients = []
# gui is None is we run as daemon
self.gui = None
def add_client(self, client): def add_client(self, client):
for key in ['fee', 'status', 'banner', 'updated', 'servers', 'interfaces']: for key in ['fee', 'status', 'banner', 'updated', 'servers', 'interfaces']: