diff options
author | João Barbosa <joao.paulo.barbosa@gmail.com> | 2020-02-16 11:38:49 +0000 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2020-06-09 20:50:21 +0800 |
commit | 30a28146ac23aa3a9e510c5d6ab9a8d2c5b8177e (patch) | |
tree | 64d9fecb8043ed6e8e04c641e6e329ced8bfb54f /src/qt | |
parent | 0d87a5b4e2153a00e33474b56b48f0814c231697 (diff) | |
download | bitcoin-30a28146ac23aa3a9e510c5d6ab9a8d2c5b8177e.tar.xz |
gui: Avoid Wallet::GetBalance in WalletModel::pollBalanceChanged
Github-Pull: #18160
Rebased-From: 0933a37078e1ce3a3d70983c3e7f4b3ac6c3fa37
Diffstat (limited to 'src/qt')
-rw-r--r-- | src/qt/walletmodel.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index cb8dd3cc10..506d17ac17 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -77,21 +77,18 @@ void WalletModel::pollBalanceChanged() // rescan. interfaces::WalletBalances new_balances; int numBlocks = -1; - if (!m_wallet->tryGetBalances(new_balances, numBlocks)) { + if (!m_wallet->tryGetBalances(new_balances, numBlocks, fForceCheckBalanceChanged, cachedNumBlocks)) { return; } - if(fForceCheckBalanceChanged || numBlocks != cachedNumBlocks) - { - fForceCheckBalanceChanged = false; + fForceCheckBalanceChanged = false; - // Balance and number of transactions might have changed - cachedNumBlocks = numBlocks; + // Balance and number of transactions might have changed + cachedNumBlocks = numBlocks; - checkBalanceChanged(new_balances); - if(transactionTableModel) - transactionTableModel->updateConfirmations(); - } + checkBalanceChanged(new_balances); + if(transactionTableModel) + transactionTableModel->updateConfirmations(); } void WalletModel::checkBalanceChanged(const interfaces::WalletBalances& new_balances) |