Merge pull request #967

e596e25 simplewallet: do not suggest removing cache if the password was wrong (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-08-22 22:54:22 +02:00
commit 1843d189c3
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -1701,6 +1701,8 @@ bool simple_wallet::open_wallet(const string &wallet_file, const std::string& pa
catch (const std::exception& e)
{
fail_msg_writer() << tr("failed to load wallet: ") << e.what();
// only suggest removing cache if the password was actually correct
if (m_wallet->verify_password(password))
fail_msg_writer() << boost::format(tr("You may want to remove the file \"%s\" and try again")) % wallet_file;
return false;
}