Merge pull request #1334

265e460 Fixed generate-from-json bug introduced in 358e068 (Lee Clagett)
2016-11-13 11:32:43 +02:00 · 2016-11-13 11:32:43 +02:00 · 9363b2ac19
parent 56c4514486 265e4605ec
commit 9363b2ac19
1 changed files with 2 additions and 1 deletions
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@ -1134,7 +1134,8 @@ 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;
-      if (!tools::wallet2::make_from_json(vm, m_wallet_file))
+      m_wallet = tools::wallet2::make_from_json(vm, m_wallet_file);
+      if (!m_wallet)
        return false;
    }
    else