From 8db2d8d4165921dfeee57903bb3e774f3bcd9ab3 Mon Sep 17 00:00:00 2001
From: moneromooo-monero <moneromooo-monero@users.noreply.github.com>
Date: Wed, 19 Sep 2018 19:55:38 +0000
Subject: [PATCH] simplewallet: fix --generate-from-json setting wrong wallet
filename
---
src/simplewallet/simplewallet.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 391d1f03e..01619393a 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -3278,10 +3278,10 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
else if (!m_generate_from_json.empty())
{
- m_wallet_file = m_generate_from_json;
try
{
- m_wallet = tools::wallet2::make_from_json(vm, false, m_wallet_file, password_prompter);
+ m_wallet = tools::wallet2::make_from_json(vm, false, m_generate_from_json, password_prompter);
+ m_wallet_file = m_wallet->path();
}
catch (const std::exception &e)
{