qt: Early subscribe core signals in transaction table model

promag · promag · commit 57785fb7f61e · 2021-04-29T00:18:55.000+01:00
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
@@ -118,6 +118,7 @@ class TransactionTablePriv
             }
         }
         m_loaded = true;
+        DispatchNotifications();
     }
 
     /* Update our model of the wallet incrementally, to synchronize our model of the wallet
@@ -252,12 +253,12 @@ TransactionTableModel::TransactionTableModel(const PlatformStyle *_platformStyle
         fProcessingQueuedTransactions(false),
         platformStyle(_platformStyle)
 {
+    subscribeToCoreSignals();
+
     columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
     priv->refreshWallet(walletModel->wallet());
 
     connect(walletModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &TransactionTableModel::updateDisplayUnit);
-
-    subscribeToCoreSignals();
 }
 
 TransactionTableModel::~TransactionTableModel()
@@ -722,7 +723,7 @@ void TransactionTablePriv::NotifyTransactionChanged(const uint256 &hash, ChangeT
 
     TransactionNotification notification(hash, status, showTransaction);
 
-    if (m_loading)
+    if (!m_loaded || m_loading)
     {
         vQueueNotifications.push_back(notification);
         return;
@@ -732,7 +733,7 @@ void TransactionTablePriv::NotifyTransactionChanged(const uint256 &hash, ChangeT
 
 void TransactionTablePriv::DispatchNotifications()
 {
-    if (m_loading) return;
+    if (!m_loaded || m_loading) return;
 
     {
         if (vQueueNotifications.size() > 10) { // prevent balloon spam, show maximum 10 balloons

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ class TransactionTablePriv`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`m_loaded = true;`
	`121`	`+ DispatchNotifications();`
`121`	`122`	`}`
`122`	`123`
`123`	`124`	`/* Update our model of the wallet incrementally, to synchronize our model of the wallet`
`@@ -252,12 +253,12 @@ TransactionTableModel::TransactionTableModel(const PlatformStyle *_platformStyle`
`252`	`253`	`fProcessingQueuedTransactions(false),`
`253`	`254`	`platformStyle(_platformStyle)`
`254`	`255`	`{`
	`256`	`+ subscribeToCoreSignals();`
	`257`	`+`
`255`	`258`	`columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());`
`256`	`259`	`priv->refreshWallet(walletModel->wallet());`
`257`	`260`
`258`	`261`	`connect(walletModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &TransactionTableModel::updateDisplayUnit);`
`259`		`-`
`260`		`- subscribeToCoreSignals();`
`261`	`262`	`}`
`262`	`263`
`263`	`264`	`TransactionTableModel::~TransactionTableModel()`
`@@ -722,7 +723,7 @@ void TransactionTablePriv::NotifyTransactionChanged(const uint256 &hash, ChangeT`
`722`	`723`
`723`	`724`	`TransactionNotification notification(hash, status, showTransaction);`
`724`	`725`
`725`		`- if (m_loading)`
	`726`	`+ if (!m_loaded \|\| m_loading)`
`726`	`727`	`{`
`727`	`728`	`vQueueNotifications.push_back(notification);`
`728`	`729`	`return;`
`@@ -732,7 +733,7 @@ void TransactionTablePriv::NotifyTransactionChanged(const uint256 &hash, ChangeT`
`732`	`733`
`733`	`734`	`void TransactionTablePriv::DispatchNotifications()`
`734`	`735`	`{`
`735`		`- if (m_loading) return;`
	`736`	`+ if (!m_loaded \|\| m_loading) return;`
`736`	`737`
`737`	`738`	`{`
`738`	`739`	`if (vQueueNotifications.size() > 10) { // prevent balloon spam, show maximum 10 balloons`