kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1334

Browse source 
265e460 Fixed generate-from-json bug introduced in 358e068 (Lee Clagett)
This commit is contained in:
Riccardo Spagni 2016-11-13 11:32:43 +02:00
parent 56c4514486 265e4605ec
commit 9363b2ac19
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/simplewallet/simplewallet.cpp
View file

@ -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