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/transactionrecord.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/transactionrecord.cpp')
| -rw-r--r-- | src/qt/transactionrecord.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index b6614fc371..345ecfb196 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -183,7 +183,11 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx) } else { - if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0) + if (status.depth < 0) + { + status.status = TransactionStatus::Conflicted; + } + else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0) { status.status = TransactionStatus::Offline; } |