From 4efa6cb24bde25611c0ff581aa89395dc32328db Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Wed, 6 Apr 2016 10:41:01 +0200
Subject: [PATCH] load default wallet in daemon (fix #1731)

---
 lib/daemon.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/daemon.py b/lib/daemon.py
index 2b692d68b..9f625660b 100644
--- a/lib/daemon.py
+++ b/lib/daemon.py
@@ -110,8 +110,10 @@ class Daemon(DaemonThread):
             self.network.start()
         self.gui = None
         self.wallets = {}
-        # Setup server
-        cmd_runner = Commands(self.config, None, self.network)
+        # Setup JSONRPC server
+        path = config.get_wallet_path()
+        default_wallet = self.load_wallet(path)
+        cmd_runner = Commands(self.config, default_wallet, self.network)
         host = config.get('rpchost', 'localhost')
         port = config.get('rpcport', 0)
         server = SimpleJSONRPCServer((host, port), logRequests=False,