diff options
| author | Lee Clagett <code@leeclagett.com> | 2016-11-12 21:55:08 -0500 |
|---|---|---|
| committer | Lee Clagett <code@leeclagett.com> | 2016-11-12 21:55:08 -0500 |
| commit | 265e4605ecb181ed968a20c9b207ade8ea0fbd32 (patch) | |
| tree | 9a854c8846932013b8783252838f14486d425079 /src/simplewallet/simplewallet.cpp | |
| parent | Merge pull request #1330 (diff) | |
| download | monero-265e4605ecb181ed968a20c9b207ade8ea0fbd32.tar.xz | |
Fixed generate-from-json bug introduced in 358e068
Diffstat (limited to 'src/simplewallet/simplewallet.cpp')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index a2b9405c8..3190c0496 100644 --- 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 |