diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-10-31 10:45:55 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-10-31 10:46:05 +0100 |
| commit | 7bb681d4075ff02b28bda3f60b8c1243817b9bfe (patch) | |
| tree | c112dbf4216b77bb3d27399adcb06b9d93c9226f /src/qt/walletview.cpp | |
| parent | Merge pull request #5164 (diff) | |
| parent | qt: Move transaction notification to transaction table model (diff) | |
| download | discoin-7bb681d4075ff02b28bda3f60b8c1243817b9bfe.tar.xz discoin-7bb681d4075ff02b28bda3f60b8c1243817b9bfe.zip | |
Merge pull request #5168
023e63d qt: Move transaction notification to transaction table model (Wladimir J. van der Laan)
Diffstat (limited to 'src/qt/walletview.cpp')
| -rw-r--r-- | src/qt/walletview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index eff50593b..3b8fdd7e5 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -137,10 +137,12 @@ void WalletView::setWalletModel(WalletModel *walletModel) void WalletView::processNewTransaction(const QModelIndex& parent, int start, int /*end*/) { // Prevent balloon-spam when initial block download is in progress - if (!walletModel || walletModel->processingQueuedTransactions() || !clientModel || clientModel->inInitialBlockDownload()) + if (!walletModel || !clientModel || clientModel->inInitialBlockDownload()) return; TransactionTableModel *ttm = walletModel->getTransactionTableModel(); + if (!ttm || ttm->processingQueuedTransactions()) + return; QString date = ttm->index(start, TransactionTableModel::Date, parent).data().toString(); qint64 amount = ttm->index(start, TransactionTableModel::Amount, parent).data(Qt::EditRole).toULongLong(); |