Merge branch 'master' of github.com:spesmilo/electrum

This commit is contained in:
ThomasV 2018-02-27 12:19:54 +01:00
commit afd39b2f42

View file

@ -174,7 +174,7 @@ class Daemon(DaemonThread):
path = config.get_wallet_path() path = config.get_wallet_path()
wallet = self.load_wallet(path, config.get('password')) wallet = self.load_wallet(path, config.get('password'))
self.cmd_runner.wallet = wallet self.cmd_runner.wallet = wallet
response = True response = wallet is not None
elif sub == 'close_wallet': elif sub == 'close_wallet':
path = config.get_wallet_path() path = config.get_wallet_path()
if path in self.wallets: if path in self.wallets: