electrum

commit 20ee265683a637ef12950a26ace0ada99fb7868c
parent 68580164110bc0f72b38527b508345d8eacda73f
Author: ThomasV <electrumdev@gmail.com>
Date:   Fri, 22 May 2015 07:11:33 +0200

Merge pull request #1227 from kyuupichan/connecting_status

Set 'connecting' status in one place.
Diffstat:
M
lib/network.py
 | 
6
++----

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