Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7792 

9b84043 fix #7784 - deinit wallet in wallet dtor (Dusan Klinec)
This commit is contained in:
luigi1111 2021-08-11 22:30:53 -04:00
parent 3eb8f1458b 9b840439b9
commit f00db20a5f
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

9
src/wallet/wallet2.cpp
View File

@ -1215,6 +1215,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)
@ -3692,9 +3693,11 @@ void wallet2::detach_blockchain(uint64_t height, std::map<std::pair<uint64_t, ui
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
bool wallet2::deinit() bool wallet2::deinit()
{ {
m_is_initialized=false; if(m_is_initialized) {
unlock_keys_file(); m_is_initialized = false;
m_account.deinit(); unlock_keys_file();
m_account.deinit();
}
return true; return true;
} }
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------