From 103a37b0ca597be27760ef7c206c9f724fc6ed3b Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Mon, 9 Sep 2019 09:58:16 +0200
Subject: [PATCH] add wallet_path to kwargs in run_cmdline

---
 electrum/commands.py | 1 +
 electrum/daemon.py   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/electrum/commands.py b/electrum/commands.py
index df004f431..21f75f812 100644
--- a/electrum/commands.py
+++ b/electrum/commands.py
@@ -105,6 +105,7 @@ def command(s):
                     kwargs['wallet_path'] = daemon.config.get_wallet_path()
                 if cmd.requires_wallet:
                     wallet_path = kwargs.pop('wallet_path')
+                    wallet_path = standardize_path(wallet_path)
                     wallet = daemon.wallets.get(wallet_path)
                     if wallet is None:
                         raise Exception('wallet not loaded')
diff --git a/electrum/daemon.py b/electrum/daemon.py
index 3f8cb4c11..ae054e8c4 100644
--- a/electrum/daemon.py
+++ b/electrum/daemon.py
@@ -443,6 +443,8 @@ class Daemon(Logger):
         kwargs = {}
         for x in cmd.options:
             kwargs[x] = (config_options.get(x) if x in ['password', 'new_password'] else config.get(x))
+        if cmd.requires_wallet:
+            kwargs['wallet_path'] = config_options.get('wallet_path')
         func = getattr(self.cmd_runner, cmd.name)
         # fixme: not sure how to retrieve message in jsonrpcclient
         try: