diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-13 11:32:43 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-13 11:32:43 +0200 |
| commit | 9363b2ac19b9035c76d81ce002f70e2c3c1a8691 (patch) | |
| tree | 5cb0cc0ab2d66b484ae8bbd6df97fa854e63489b /src | |
| parent | 56c451448687919fec4dc455798f48a65c42c236 (diff) | |
| parent | 265e4605ecb181ed968a20c9b207ade8ea0fbd32 (diff) | |
| download | monzero-core-9363b2ac19b9035c76d81ce002f70e2c3c1a8691.tar.gz monzero-core-9363b2ac19b9035c76d81ce002f70e2c3c1a8691.tar.xz monzero-core-9363b2ac19b9035c76d81ce002f70e2c3c1a8691.zip | |
Merge pull request #1334
265e460 Fixed generate-from-json bug introduced in 358e068 (Lee Clagett)
Diffstat (limited to 'src')
| -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 |