Merge pull request #4405

8db2d8d4 simplewallet: fix --generate-from-json setting wrong wallet filename (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-09-21 20:46:54 +02:00
commit b65e236fda
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

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