Merge pull request #4482

25e5890d wallet: fix --generate-from-json using wrong password (moneromooo-monero)
This commit is contained in:
Riccardo Spagni
2018-10-02 22:45:50 +02:00
parent 9c426a30f9
commit e0fa7fa384
6 changed files with 20 additions and 7 deletions
+3 -1
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)