tMerge pull request #491 from Jud/master - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 8858ac249e99810b5fefd31549235e3004cdd279 DIR parent 3fc7d0ef9e34465a47017ffa1f567d829aa0f2a2 HTML Author: ThomasV <thomasv1@gmx.de> Date: Tue, 10 Dec 2013 04:14:25 -0800 Merge pull request #491 from Jud/master Fix error when network.is_running() is called before the network is started. Diffstat: M lib/network.py | 1 + 1 file changed, 1 insertion(+), 0 deletions(-) --- DIR diff --git a/lib/network.py b/lib/network.py t@@ -50,6 +50,7 @@ class Network(threading.Thread): self.queue = Queue.Queue() self.callbacks = {} self.protocol = self.config.get('protocol','s') + self.running = False # Server for addresses and transactions self.default_server = self.config.get('server')