highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

gui: Handle WalletModel::unload asynchronous

Browse Source 
This change prevents deleting a WalletModel instance while it's
being used.
This commit is contained in:
João Barbosa
2020-03-19 22:53:33 +00:00
parent ab31b9d6fe
commit 41b0baf43c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/walletcontroller.cpp
View File

@@ -116,7 +116,7 @@ WalletModel* WalletController::getOrCreateWallet(std::unique_ptr<interfaces::Wal
const bool called = QMetaObject::invokeMethod(wallet_model, "startPollBalance"); const bool called = QMetaObject::invokeMethod(wallet_model, "startPollBalance");
assert(called); assert(called);
connect(wallet_model, &WalletModel::unload, [this, wallet_model] { connect(wallet_model, &WalletModel::unload, this, [this, wallet_model] {
// Defer removeAndDeleteWallet when no modal widget is active. // Defer removeAndDeleteWallet when no modal widget is active.
// TODO: remove this workaround by removing usage of QDiallog::exec. // TODO: remove this workaround by removing usage of QDiallog::exec.
if (QApplication::activeModalWidget()) { if (QApplication::activeModalWidget()) {
@@ -128,7 +128,7 @@ WalletModel* WalletController::getOrCreateWallet(std::unique_ptr<interfaces::Wal
} else { } else {
removeAndDeleteWallet(wallet_model); removeAndDeleteWallet(wallet_model);
} }
}); }, Qt::QueuedConnection);
// Re-emit coinsSent signal from wallet model. // Re-emit coinsSent signal from wallet model.
connect(wallet_model, &WalletModel::coinsSent, this, &WalletController::coinsSent); connect(wallet_model, &WalletModel::coinsSent, this, &WalletController::coinsSent);