Merge pull request #4405

8db2d8d4 simplewallet: fix --generate-from-json setting wrong wallet filename (moneromooo-monero)
6 years ago · b65e236fda
parent de5631c6be 8db2d8d416
commit b65e236fda
1 changed files with 2 additions and 2 deletions
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@ -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)
      {