rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-29 10:43:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7786

Browse source 
9c6e094 fix #7784 - deinit wallet in wallet dtor (Dusan Klinec)
This commit is contained in:
luigi1111 2021-08-11 22:30:11 -04:00
commit 62844a776d
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/wallet/wallet2.cpp
View file

@ -1213,6 +1213,7 @@ wallet2::wallet2(network_type nettype, uint64_t kdf_rounds, bool unattended, std
wallet2::~wallet2() wallet2::~wallet2()
{ {
deinit();
} }
bool wallet2::has_testnet_option(const boost::program_options::variables_map& vm) bool wallet2::has_testnet_option(const boost::program_options::variables_map& vm)
@ -3748,9 +3749,11 @@ void wallet2::detach_blockchain(uint64_t height, std::map<std::pair<uint64_t, ui
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
bool wallet2::deinit() bool wallet2::deinit()
{ {
if(m_is_initialized) {
m_is_initialized = false; m_is_initialized = false;
unlock_keys_file(); unlock_keys_file();
m_account.deinit(); m_account.deinit();
}
return true; return true;
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------