Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-18 03:40:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

wallet: fix --generate-from-json using wrong password

Browse source
This commit is contained in:
moneromooo-monero 2018-10-01 11:18:50 +00:00
parent 83d8f03c23
commit 25e5890d37
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
6 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/simplewallet/simplewallet.cpp
View file

@ -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)