Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-27 06:29:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5959

Browse Source 
4d22317 wallet2: don't delete file that may not exist (selsta)
This commit is contained in:
luigi1111 2019-10-16 13:45:22 -05:00
commit 824521b7bc
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
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

@ -5589,6 +5589,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);
@ -5600,11 +5605,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))
{ {