diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-14 14:40:32 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-14 14:40:32 -0500 |
| commit | 05d3ded072d782036c31c1d773c0441b87de843e (patch) | |
| tree | 1dcdec2f37f61415aa5d1b71da101e0cfbd035fd /src/qt/transactiondesc.cpp | |
| parent | e051e65c219cc72a2bba768f3d5e043ad055b48e (diff) | |
| parent | 9a3d936fc2e98b1e8234bf27e09cf7bc22811bee (diff) | |
| download | bitcoin-05d3ded072d782036c31c1d773c0441b87de843e.tar.xz | |
Merge pull request #3669 from gavinandresen/dead_txns
Handle "conflicted" transactions properly
Diffstat (limited to 'src/qt/transactiondesc.cpp')
| -rw-r--r-- | src/qt/transactiondesc.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp index c76b29861d..9f18d79089 100644 --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -30,7 +30,9 @@ QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx) else { int nDepth = wtx.GetDepthInMainChain(); - if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0) + if (nDepth < 0) + return tr("conflicted"); + else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0) return tr("%1/offline").arg(nDepth); else if (nDepth < 6) return tr("%1/unconfirmed").arg(nDepth); |