Merge pull request #491 from Jud/master

Fix error when network.is_running() is called before the network is started.
2013-12-10 04:14:25 -08:00 · 2013-12-10 04:14:25 -08:00 · 8858ac249e
parent 3fc7d0ef9e 03a6791bcb
commit 8858ac249e
1 changed files with 1 additions and 0 deletions
--- a/lib/network.py
+++ b/lib/network.py
@ -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')