From 37ad7d8b0ba8e4991c184db89b9911f971c74e45 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Fri, 25 Jul 2014 16:44:22 +0200
Subject: [PATCH] gui should always use daemon if it is running

---
 electrum | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/electrum b/electrum
index 10fecc10..a1d5c772 100755
--- a/electrum
+++ b/electrum
@@ -221,8 +221,8 @@ if __name__ == '__main__':
 
         # network interface
         if not options.offline:
-            if options.daemon:
-                s = daemon_socket()
+            s = daemon_socket(start_daemon=options.daemon)
+            if s:
                 network = NetworkProxy(s, config)
                 network.start()
             else: