monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wallet2: don't delete file that may not exist

Browse source
This commit is contained in:
selsta 2019-10-04 20:41:37 +02:00
parent b8643752c1
commit 4d22317dee
No known key found for this signature in database
GPG key ID: 2EA0A99A8B07AE5E
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/wallet/wallet2.cpp
View file

@ -5570,6 +5570,11 @@ void wallet2::store_to(const std::string &path, const epee::wipeable_string &pas
const std::string address_file = m_wallet_file + ".address.txt"; const std::string address_file = m_wallet_file + ".address.txt";
r = save_to_file(address_file, m_account.get_public_address_str(m_nettype), true); r = save_to_file(address_file, m_account.get_public_address_str(m_nettype), true);
THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, m_wallet_file); THROW_WALLET_EXCEPTION_IF(!r, error::file_save_error, m_wallet_file);
// remove old address file
r = boost::filesystem::remove(old_address_file);
if (!r) {
LOG_ERROR("error removing file: " << old_address_file);
}
} }
// remove old wallet file // remove old wallet file
r = boost::filesystem::remove(old_file); r = boost::filesystem::remove(old_file);
@ -5581,11 +5586,6 @@ void wallet2::store_to(const std::string &path, const epee::wipeable_string &pas
if (!r) { if (!r) {
LOG_ERROR("error removing file: " << old_keys_file); LOG_ERROR("error removing file: " << old_keys_file);
} }
// remove old address file
r = boost::filesystem::remove(old_address_file);
if (!r) {
LOG_ERROR("error removing file: " << old_address_file);
}
// remove old message store file // remove old message store file
if (boost::filesystem::exists(old_mms_file)) if (boost::filesystem::exists(old_mms_file))
{ {