diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-09-21 20:46:54 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-09-21 20:46:54 +0200 |
| commit | b65e236fdad07648204a71812fcf4e97293ef227 (patch) | |
| tree | 3684bf300011466a6ce66963a08d7a68188f11f8 /src/simplewallet/simplewallet.cpp | |
| parent | Merge pull request #4402 (diff) | |
| parent | simplewallet: fix --generate-from-json setting wrong wallet filename (diff) | |
| download | monero-b65e236fdad07648204a71812fcf4e97293ef227.tar.xz | |
Merge pull request #4405
8db2d8d4 simplewallet: fix --generate-from-json setting wrong wallet filename (moneromooo-monero)
Diffstat (limited to 'src/simplewallet/simplewallet.cpp')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 7f71ce9f2..302d2a999 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -3273,10 +3273,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) { |