Merge pull request #7786
9c6e094
fix #7784 - deinit wallet in wallet dtor (Dusan Klinec)
This commit is contained in:
commit
62844a776d
|
@ -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;
|
||||||
}
|
}
|
||||||
//----------------------------------------------------------------------------------------------------
|
//----------------------------------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue