gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-12-29 14:13:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4405

Browse Source 
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
parent de5631c6be 8db2d8d416
commit b65e236fda
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/simplewallet/simplewallet.cpp
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)
{