aboutsummaryrefslogtreecommitdiff
path: root/src/simplewallet
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-09-19 19:55:38 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2018-09-19 20:22:46 +0000
commit8db2d8d4165921dfeee57903bb3e774f3bcd9ab3 (patch)
tree600e7064a80e5afaca327a8a17feac39299dcc94 /src/simplewallet
parentMerge pull request #4391 (diff)
downloadmonero-8db2d8d4165921dfeee57903bb3e774f3bcd9ab3.tar.xz
simplewallet: fix --generate-from-json setting wrong wallet filename
Diffstat (limited to 'src/simplewallet')
-rw-r--r--src/simplewallet/simplewallet.cpp4
1 files 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)
{