gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-06-12 19:11:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9899

Browse Source 
05ab316 epee: better scope leaver (jeffro256)
This commit is contained in:
tobtoht
2026-05-06 19:34:39 +00:00
parent 5d8e1cc94f 05ab316853
commit 49ea802139
6 changed files with 241 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/wallet2.cpp
+4 -4
View File
@@ -13993,11 +13993,11 @@ void wallet2::stop_background_sync(const epee::wipeable_string &wallet_password,
// Set the plaintext spend key
m_account.set_spend_key(recovered_spend_key);
if (is_key_encryption_enabled())
this->encrypt_keys(wallet_password);
// Encrypt the spend key when done if needed
epee::misc_utils::auto_scope_leave_caller keys_reencryptor;
if (m_ask_password == AskPasswordToDecrypt && !m_unattended && !m_watch_only)
keys_reencryptor = epee::misc_utils::create_scope_leave_handler([&, this]{encrypt_keys(wallet_password);});
// Decrypt now, then re-encrypt the spend key when done if needed
wallet_keys_unlocker unlocker(*this, &wallet_password);
// Now we can use the decrypted spend key to process background cache
process_background_cache(background_sync_data, background_synced_chain, last_block_reward);