aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorwoodser <woodser@protonmail.com>2021-12-24 09:22:57 -0500
committerwoodser <woodser@protonmail.com>2022-01-30 10:22:59 -0500
commit34c1561a01abbe58c6f6176c53a4acf1c1439953 (patch)
treeada21ac9485e9c07e603686d3924c9278cff6a9e /src
parentMerge pull request #8131 (diff)
downloadmonero-34c1561a01abbe58c6f6176c53a4acf1c1439953.tar.xz
wallet inits cache if file and blob missing
Diffstat (limited to 'src')
-rw-r--r--src/wallet/wallet2.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index cbdda4f72..8f8fc7160 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -5627,13 +5627,14 @@ void wallet2::load(const std::string& wallet_, const epee::wipeable_string& pass
wallet_keys_unlocker unlocker(*this, m_ask_password == AskPasswordToDecrypt && !m_unattended && !m_watch_only, password);
//keys loaded ok!
- //try to load wallet file. but even if we failed, it is not big problem
- if (use_fs && (!boost::filesystem::exists(m_wallet_file, e) || e))
+ //try to load wallet cache. but even if we failed, it is not big problem
+ bool cache_missing = use_fs ? (!boost::filesystem::exists(m_wallet_file, e) || e) : cache_buf.empty();
+ if (cache_missing)
{
- LOG_PRINT_L0("file not found: " << m_wallet_file << ", starting with empty blockchain");
+ LOG_PRINT_L0("wallet cache missing: " << m_wallet_file << ", starting with empty blockchain");
m_account_public_address = m_account.get_keys().m_account_address;
}
- else if (use_fs || !cache_buf.empty())
+ else
{
wallet2::cache_file_data cache_file_data;
std::string cache_file_buf;