electrum

commit 0e49274eae9f497164ecc694729acdcf1188a43a
parent 2b0a7bcd735dbf0bcc9458979554cfee4745fc2c
Author: ThomasV <thomasv@electrum.org>
Date:   Sat, 11 Mar 2017 10:26:26 +0100

fix #2279: jsonrpc wallet

Diffstat:
M
lib/daemon.py
 | 
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/daemon.py b/lib/daemon.py
@@ -116,8 +116,7 @@ class Daemon(DaemonThread):
         self.gui = None
         self.wallets = {}
         # Setup JSONRPC server
-        default_wallet = None
-        self.cmd_runner = Commands(self.config, default_wallet, self.network)
+        self.cmd_runner = Commands(self.config, None, self.network)
         self.init_server(config, fd)
 
     def init_server(self, config, fd):
@@ -153,7 +152,8 @@ class Daemon(DaemonThread):
             response = "Daemon already running"
         elif sub == 'load_wallet':
             path = config.get_wallet_path()
-            self.load_wallet(path, config.get('password'))
+            wallet = self.load_wallet(path, config.get('password'))
+            self.cmd_runner.wallet = wallet
             response = True
         elif sub == 'close_wallet':
             path = config.get_wallet_path()