gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-01 07:26:15 -08:00
Code Issues Packages Projects Releases Wiki Activity

more pointer-based derp

Browse Source
This commit is contained in:
Thomas Winget
2014-06-06 16:31:04 -04:00
parent 72c3f36ca4
commit 8bc032ed09
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/simplewallet/simplewallet.cpp
View File

@@ -255,10 +255,15 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
return false;
}
size_t c = 0;
if(!m_generate_new.empty()) ++c;
if(!m_wallet_file.empty()) ++c;
if (1 != c)
if(m_recover)
{
if (m_generate_new.empty())
{
fail_msg_writer() << "You must specify a wallet file name to recover to using either --generate-new-wallet=\"name\"";
return false;
}
}
else if(!m_generate_new.empty() ^ !m_wallet_file.empty())
{
if(!ask_wallet_create_if_needed())
return false;
@@ -286,7 +291,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
}
}
if (!m_generate_new.empty())
if (!m_generate_new.empty() || m_recover)
{
// check for recover flag. if present, require electrum word list (only recovery option for now).
if (m_recover)