Skip to content

Commit 57785fb

Browse files
committed
qt: Early subscribe core signals in transaction table model
1 parent c6cbdf1 commit 57785fb

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/qt/transactiontablemodel.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ class TransactionTablePriv
118118
}
119119
}
120120
m_loaded = true;
121+
DispatchNotifications();
121122
}
122123

123124
/* Update our model of the wallet incrementally, to synchronize our model of the wallet
@@ -252,12 +253,12 @@ TransactionTableModel::TransactionTableModel(const PlatformStyle *_platformStyle
252253
fProcessingQueuedTransactions(false),
253254
platformStyle(_platformStyle)
254255
{
256+
subscribeToCoreSignals();
257+
255258
columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
256259
priv->refreshWallet(walletModel->wallet());
257260

258261
connect(walletModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &TransactionTableModel::updateDisplayUnit);
259-
260-
subscribeToCoreSignals();
261262
}
262263

263264
TransactionTableModel::~TransactionTableModel()
@@ -722,7 +723,7 @@ void TransactionTablePriv::NotifyTransactionChanged(const uint256 &hash, ChangeT
722723

723724
TransactionNotification notification(hash, status, showTransaction);
724725

725-
if (m_loading)
726+
if (!m_loaded || m_loading)
726727
{
727728
vQueueNotifications.push_back(notification);
728729
return;
@@ -732,7 +733,7 @@ void TransactionTablePriv::NotifyTransactionChanged(const uint256 &hash, ChangeT
732733

733734
void TransactionTablePriv::DispatchNotifications()
734735
{
735-
if (m_loading) return;
736+
if (!m_loaded || m_loading) return;
736737

737738
{
738739
if (vQueueNotifications.size() > 10) { // prevent balloon spam, show maximum 10 balloons

0 commit comments

Comments
 (0)