AaronFiore/electrum
1
0
Fork 0
Code Activity

Set 'connecting' status in one place.

Browse Source 
Also means when switching to an already connected server our
status doesn't quickly change to connecting and back again.
This commit is contained in:
Neil Booth
2015-05-22 09:45:51 +09:00
parent 6858016411
commit 05dd310431
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/network.py
View File

@@ -148,7 +148,6 @@ class Network(util.DaemonThread):
self.pending_servers = set() self.pending_servers = set()
self.banner = '' self.banner = ''
self.interface = None
self.heights = {} self.heights = {}
self.merkle_roots = {} self.merkle_roots = {}
self.utxo_roots = {} self.utxo_roots = {}
@@ -279,6 +278,8 @@ class Network(util.DaemonThread):
def start_interface(self, server): def start_interface(self, server):
if not server in self.interfaces.keys(): if not server in self.interfaces.keys():
if server == self.default_server:
self.set_status('connecting')
i = interface.Interface(server, self.queue, self.config) i = interface.Interface(server, self.queue, self.config)
self.pending_servers.add(server) self.pending_servers.add(server)
i.start() i.start()
@@ -313,7 +314,6 @@ class Network(util.DaemonThread):
def start_network(self, protocol, proxy): def start_network(self, protocol, proxy):
assert not self.interface and not self.interfaces assert not self.interface and not self.interfaces
self.print_error('starting network') self.print_error('starting network')
self.set_status('connecting')
self.disconnected_servers = set([]) self.disconnected_servers = set([])
self.protocol = protocol self.protocol = protocol
self.set_proxy(proxy) self.set_proxy(proxy)
@@ -380,8 +380,6 @@ class Network(util.DaemonThread):
if self.is_connected(): if self.is_connected():
self.stop_interface() self.stop_interface()
# notify gui
self.set_status('connecting')
# start interface # start interface
self.default_server = server self.default_server = server