diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-02 22:39:56 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-02 22:45:50 +0200 |
| commit | e0fa7fa38488784efd1cbb87922b3079370e0b55 (patch) | |
| tree | d7db90eb69beb278b7de01e920364581ee65ba6b /src/simplewallet/simplewallet.cpp | |
| parent | Merge pull request #4479 (diff) | |
| download | monero-e0fa7fa38488784efd1cbb87922b3079370e0b55.tar.xz | |
Merge pull request #4482
25e5890d wallet: fix --generate-from-json using wrong password (moneromooo-monero)
Diffstat (limited to '')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 7c68de3f3..90f8535d7 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -3275,7 +3275,9 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm) { try { - m_wallet = tools::wallet2::make_from_json(vm, false, m_generate_from_json, password_prompter); + auto rc = tools::wallet2::make_from_json(vm, false, m_generate_from_json, password_prompter); + m_wallet = std::move(rc.first); + password = rc.second.password(); m_wallet_file = m_wallet->path(); } catch (const std::exception &e) |