mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-18 13:17:55 +02:00
Merge 439e58c4d8 into merged_master (Bitcoin PR bitcoin-core/gui#360)
This commit is contained in:
commit
e7bffde774
1 changed files with 11 additions and 0 deletions
|
|
@ -335,6 +335,17 @@ void BitcoinApplication::requestShutdown()
|
|||
window->setClientModel(nullptr);
|
||||
pollShutdownTimer->stop();
|
||||
|
||||
#ifdef ENABLE_WALLET
|
||||
// Delete wallet controller here manually, instead of relying on Qt object
|
||||
// tracking (https://doc.qt.io/qt-5/objecttrees.html). This makes sure
|
||||
// walletmodel m_handle_* notification handlers are deleted before wallets
|
||||
// are unloaded, which can simplify wallet implementations. It also avoids
|
||||
// these notifications having to be handled while GUI objects are being
|
||||
// destroyed, making GUI code less fragile as well.
|
||||
delete m_wallet_controller;
|
||||
m_wallet_controller = nullptr;
|
||||
#endif // ENABLE_WALLET
|
||||
|
||||
delete clientModel;
|
||||
clientModel = nullptr;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue