[Qt] Call checkBalanceChanged() periodically instead for every updated transaction

cozz · cozz · commit 80daee0fb585 · 2014-08-26T19:18:33.000+02:00
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
@@ -36,6 +36,7 @@ WalletModel::WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *p
 {
     fProcessingQueuedTransactions = false;
     fHaveWatchOnly = wallet->HaveWatchOnly();
+    fForceCheckBalanceChanged = false;
 
     addressTableModel = new AddressTableModel(wallet, this);
     transactionTableModel = new TransactionTableModel(wallet, this);
@@ -121,8 +122,10 @@ void WalletModel::pollBalanceChanged()
     if(!lockWallet)
         return;
 
-    if(chainActive.Height() != cachedNumBlocks)
+    if(fForceCheckBalanceChanged || chainActive.Height() != cachedNumBlocks)
     {
+        fForceCheckBalanceChanged = false;
+
         // Balance and number of transactions might have changed
         cachedNumBlocks = chainActive.Height();
 
@@ -167,7 +170,7 @@ void WalletModel::updateTransaction(const QString &hash, int status)
         transactionTableModel->updateTransaction(hash, status);
 
     // Balance and number of transactions might have changed
-    checkBalanceChanged();
+    fForceCheckBalanceChanged = true;
 }
 
 void WalletModel::updateAddressBook(const QString &address, const QString &label,
@@ -344,6 +347,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
         }
         emit coinsSent(wallet, rcp, transaction_array);
     }
+    checkBalanceChanged(); // update balance immediately, otherwise there could be a short noticeable delay until pollBalanceChanged hits
 
     return SendCoinsReturn(OK);
 }
@@ -473,11 +477,6 @@ static void NotifyTransactionChanged(WalletModel *walletmodel, CWallet *wallet,
 
 static void ShowProgress(WalletModel *walletmodel, const std::string &title, int nProgress)
 {
-    // emits signal "showProgress"
-    QMetaObject::invokeMethod(walletmodel, "showProgress", Qt::QueuedConnection,
-                              Q_ARG(QString, QString::fromStdString(title)),
-                              Q_ARG(int, nProgress));
-
     if (nProgress == 0)
         fQueueNotifications = true;
 
@@ -495,6 +494,11 @@ static void ShowProgress(WalletModel *walletmodel, const std::string &title, int
         }
         std::vector<std::pair<uint256, ChangeType> >().swap(vQueueNotifications); // clear
     }
+
+    // emits signal "showProgress"
+    QMetaObject::invokeMethod(walletmodel, "showProgress", Qt::QueuedConnection,
+                              Q_ARG(QString, QString::fromStdString(title)),
+                              Q_ARG(int, nProgress));
 }
 
 static void NotifyWatchonlyChanged(WalletModel *walletmodel, bool fHaveWatchonly)
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -199,6 +199,7 @@ class WalletModel : public QObject
     CWallet *wallet;
     bool fProcessingQueuedTransactions;
     bool fHaveWatchOnly;
+    bool fForceCheckBalanceChanged;
 
     // Wallet has an options model for wallet-specific options
     // (transaction fee, for example)

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ WalletModel::WalletModel(CWallet wallet, OptionsModel optionsModel, QObject *p`
`36`	`36`	`{`
`37`	`37`	`fProcessingQueuedTransactions = false;`
`38`	`38`	`fHaveWatchOnly = wallet->HaveWatchOnly();`
	`39`	`+ fForceCheckBalanceChanged = false;`
`39`	`40`
`40`	`41`	`addressTableModel = new AddressTableModel(wallet, this);`
`41`	`42`	`transactionTableModel = new TransactionTableModel(wallet, this);`
`@@ -121,8 +122,10 @@ void WalletModel::pollBalanceChanged()`
`121`	`122`	`if(!lockWallet)`
`122`	`123`	`return;`
`123`	`124`
`124`		`- if(chainActive.Height() != cachedNumBlocks)`
	`125`	`+ if(fForceCheckBalanceChanged \|\| chainActive.Height() != cachedNumBlocks)`
`125`	`126`	`{`
	`127`	`+ fForceCheckBalanceChanged = false;`
	`128`	`+`
`126`	`129`	`// Balance and number of transactions might have changed`
`127`	`130`	`cachedNumBlocks = chainActive.Height();`
`128`	`131`
`@@ -167,7 +170,7 @@ void WalletModel::updateTransaction(const QString &hash, int status)`
`167`	`170`	`transactionTableModel->updateTransaction(hash, status);`
`168`	`171`
`169`	`172`	`// Balance and number of transactions might have changed`
`170`		`- checkBalanceChanged();`
	`173`	`+ fForceCheckBalanceChanged = true;`
`171`	`174`	`}`
`172`	`175`
`173`	`176`	`void WalletModel::updateAddressBook(const QString &address, const QString &label,`
`@@ -344,6 +347,7 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran`
`344`	`347`	`}`
`345`	`348`	`emit coinsSent(wallet, rcp, transaction_array);`
`346`	`349`	`}`
	`350`	`+ checkBalanceChanged(); // update balance immediately, otherwise there could be a short noticeable delay until pollBalanceChanged hits`
`347`	`351`
`348`	`352`	`return SendCoinsReturn(OK);`
`349`	`353`	`}`
`@@ -473,11 +477,6 @@ static void NotifyTransactionChanged(WalletModel walletmodel, CWallet wallet,`
`473`	`477`
`474`	`478`	`static void ShowProgress(WalletModel *walletmodel, const std::string &title, int nProgress)`
`475`	`479`	`{`
`476`		`- // emits signal "showProgress"`
`477`		`- QMetaObject::invokeMethod(walletmodel, "showProgress", Qt::QueuedConnection,`
`478`		`- Q_ARG(QString, QString::fromStdString(title)),`
`479`		`- Q_ARG(int, nProgress));`
`480`		`-`
`481`	`480`	`if (nProgress == 0)`
`482`	`481`	`fQueueNotifications = true;`
`483`	`482`
`@@ -495,6 +494,11 @@ static void ShowProgress(WalletModel *walletmodel, const std::string &title, int`
`495`	`494`	`}`
`496`	`495`	`std::vector<std::pair<uint256, ChangeType> >().swap(vQueueNotifications); // clear`
`497`	`496`	`}`
	`497`	`+`
	`498`	`+ // emits signal "showProgress"`
	`499`	`+ QMetaObject::invokeMethod(walletmodel, "showProgress", Qt::QueuedConnection,`
	`500`	`+ Q_ARG(QString, QString::fromStdString(title)),`
	`501`	`+ Q_ARG(int, nProgress));`
`498`	`502`	`}`
`499`	`503`
`500`	`504`	`static void NotifyWatchonlyChanged(WalletModel *walletmodel, bool fHaveWatchonly)`