From d296005194c7bd8c65006ddf1b25052b2655c923 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Sat, 7 Dec 2024 01:19:28 +0300 Subject: [PATCH] fix(qt): allow refreshing wallet data without crashing --- src/qt/transactiontablemodel.cpp | 16 +++++++++------- src/qt/transactiontablemodel.h | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index 01de92c61d289..3d2052d445c19 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -106,10 +106,11 @@ class TransactionTablePriv /* Query entire wallet anew from core. */ - void refreshWallet(interfaces::Wallet& wallet) + void refreshWallet(interfaces::Wallet& wallet, bool force = false) { parent->beginResetModel(); - assert(!m_loaded); + assert(!m_loaded || force); + cachedWallet.clear(); try { for (const auto& wtx : wallet.getWalletTxs()) { if (TransactionRecord::showTransaction()) { @@ -284,9 +285,9 @@ TransactionTableModel::~TransactionTableModel() delete priv; } -void TransactionTableModel::refreshWallet() +void TransactionTableModel::refreshWallet(bool force) { - priv->refreshWallet(walletModel->wallet()); + priv->refreshWallet(walletModel->wallet(), force); } /** Updates the column title to "Amount (DisplayUnit)" and emits headerDataChanged() signal for table headers to react. */ @@ -846,12 +847,13 @@ void TransactionTablePriv::DispatchNotifications() vQueueNotifications[i].invoke(parent); } + vQueueNotifications.clear(); } else { - // it's much faster to just refresh the whole thing instead - bool invoked = QMetaObject::invokeMethod(parent, "refreshWallet", Qt::QueuedConnection); + // it's much faster to just drop all the queued notifications and refresh the whole thing instead + vQueueNotifications.clear(); + bool invoked = QMetaObject::invokeMethod(parent, "refreshWallet", Qt::QueuedConnection, Q_ARG(bool, true)); assert(invoked); } - vQueueNotifications.clear(); } void TransactionTableModel::subscribeToCoreSignals() diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h index b1f933e25523e..630fec039f731 100644 --- a/src/qt/transactiontablemodel.h +++ b/src/qt/transactiontablemodel.h @@ -114,7 +114,7 @@ class TransactionTableModel : public QAbstractTableModel public Q_SLOTS: /* Refresh the whole wallet, helpful for huge notification queues */ - void refreshWallet(); + void refreshWallet(bool foce = false); /* New transaction, or transaction changed status */ void updateTransaction(const QString &hash, int status, bool showTransaction); void updateAddressBook(const QString &address, const QString &label,