diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-14 07:59:07 +0100 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2014-02-14 13:25:24 -0500 |
| commit | 9a3d936fc2e98b1e8234bf27e09cf7bc22811bee (patch) | |
| tree | 6c04425a46f658ed92568c7a2ede61a6754cbd40 /src/qt/transactionrecord.cpp | |
| parent | 2b72d46f4232b58835d44aa3abd711df399d4728 (diff) | |
| download | bitcoin-9a3d936fc2e98b1e8234bf27e09cf7bc22811bee.tar.xz | |
qt: GUI for conflicted transactions
- Exclamation mark icon for conflicted transactions
- Show mouseover status for conflicted transactions as "conflicted"
- Don't show inactive transactions on overview page overview
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; } |