4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-15 12:56:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplewallet: do not ask wallet filename twice when restoring

Browse Source 
It's annoying and pointless (especially as it's the only thing
where the user is asked twice)
This commit is contained in:
moneromooo-monero 2017-08-06 12:28:00 +01:00
parent ab594cfee9
commit 042b86c473
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
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

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