Merge pull request #1334

265e460 Fixed generate-from-json bug introduced in 358e068 (Lee Clagett)
monero-project · Nov 13, 2016 · 9363b2a · 9363b2a
2 parents 56c4514 + 265e460
commit 9363b2a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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