electrum

commit 32cca276fe7a13af0a41d319c5d0ed92211edabc
parent f56fbb509f12a981bfac153931016185499b480c
Author: ThomasV <thomasv@gitorious>
Date:   Thu, 13 Mar 2014 19:23:26 +0100

don't use recent_servers if list from irc is available

Diffstat:
M
lib/network.py
 | 
13
++++++++-----

1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/lib/network.py b/lib/network.py
@@ -182,11 +182,14 @@ class Network(threading.Thread):
 
 
     def get_servers(self):
-        out = self.irc_servers if self.irc_servers else DEFAULT_SERVERS
-        for s in self.recent_servers:
-            host, port, protocol = s.split(':')
-            if host not in out:
-                out[host] = { protocol:port }
+        if self.irc_servers:
+            out = self.irc_servers  
+        else:
+            out = DEFAULT_SERVERS
+            for s in self.recent_servers:
+                host, port, protocol = s.split(':')
+                if host not in out:
+                    out[host] = { protocol:port }
         return out
 
     def start_interface(self, server):