diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-17 14:09:46 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-21 07:46:33 +0200 |
commit | 3015e0bca6bc2cb8beb747873fdf7b80e74d679f (patch) | |
tree | a66ed0fe4911a3bc3244f629f8871b286b6f0a35 /src/qt/transactionfilterproxy.cpp | |
parent | 39d3f2cb40a539fff1daba3d76a6c59e932d0f0a (diff) | |
download | bitcoin-3015e0bca6bc2cb8beb747873fdf7b80e74d679f.tar.xz |
Revert "UI to alert of respend attempt affecting wallet."
This reverts commit ada5a067c75f19a724cc054286ecf2254e5dbe8f.
Conflicts:
src/qt/guiconstants.h
src/wallet.h
Diffstat (limited to 'src/qt/transactionfilterproxy.cpp')
-rw-r--r-- | src/qt/transactionfilterproxy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp index 7293029787..f9546fddb5 100644 --- a/src/qt/transactionfilterproxy.cpp +++ b/src/qt/transactionfilterproxy.cpp @@ -24,7 +24,7 @@ TransactionFilterProxy::TransactionFilterProxy(QObject *parent) : typeFilter(ALL_TYPES), minAmount(0), limitRows(-1), - showInactive(false) + showInactive(true) { } @@ -39,7 +39,7 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex & qint64 amount = llabs(index.data(TransactionTableModel::AmountRole).toLongLong()); int status = index.data(TransactionTableModel::StatusRole).toInt(); - if(!showInactive && status == TransactionStatus::Conflicted && type == TransactionRecord::Other) + if(!showInactive && status == TransactionStatus::Conflicted) return false; if(!(TYPE(type) & typeFilter)) return false; |