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

Merge pull request #2256

Browse source 
042b86c4 simplewallet: do not ask wallet filename twice when restoring (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-08-15 20:49:26 +02:00
parent 85211cda22 042b86c473
commit 718941bee0
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/simplewallet/simplewallet.cpp
View file

@ -919,14 +919,19 @@ bool simple_wallet::ask_wallet_create_if_needed()
}
else if(!wallet_file_exists && !keys_file_exists) //No wallet, no keys
{
message_writer() << tr(m_restoring ? "Confirm wallet name: " : "No wallet found with that name. Confirm creation of new wallet named: ") << wallet_path;
confirm_creation = command_line::input_line(tr("(Y/Yes/N/No): "));
if(std::cin.eof())
bool ok = true;
if (!m_restoring)
{
LOG_ERROR("Unexpected std::cin.eof() - Exited simple_wallet::ask_wallet_create_if_needed()");
return false;
message_writer() << tr("No wallet found with that name. Confirm creation of new wallet named: ") << wallet_path;
confirm_creation = command_line::input_line(tr("(Y/Yes/N/No): "));
if(std::cin.eof())
{
LOG_ERROR("Unexpected std::cin.eof() - Exited simple_wallet::ask_wallet_create_if_needed()");
return false;
}
ok = command_line::is_yes(confirm_creation);
}
if(command_line::is_yes(confirm_creation))
if (ok)
{
success_msg_writer() << tr("Generating new wallet...");
m_generate_new = wallet_path;