diff options
| author | Gavin Andresen <[email protected]> | 2013-10-14 20:39:00 -0700 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-10-14 20:39:00 -0700 |
| commit | b9beea6e9d0f789f11d249b040e549d535bdc295 (patch) | |
| tree | e87c3422b52b1f6d78b88b9cea756c1f3cb8d37b /src/qt/transactionrecord.cpp | |
| parent | Merge pull request #2933 from sipa/leveldb113 (diff) | |
| parent | Refactor/encapsulate chain globals into a CChain class (diff) | |
| download | discoin-b9beea6e9d0f789f11d249b040e549d535bdc295.tar.xz discoin-b9beea6e9d0f789f11d249b040e549d535bdc295.zip | |
Merge pull request #3077 from sipa/chain
Refactor/encapsulate chain globals into a CChain class
Diffstat (limited to 'src/qt/transactionrecord.cpp')
| -rw-r--r-- | src/qt/transactionrecord.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index ea2c1f0a5..162908a9a 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -160,14 +160,14 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx) idx); status.confirmed = wtx.IsConfirmed(); status.depth = wtx.GetDepthInMainChain(); - status.cur_num_blocks = nBestHeight; + status.cur_num_blocks = chainActive.Height(); if (!IsFinalTx(wtx)) { if (wtx.nLockTime < LOCKTIME_THRESHOLD) { status.status = TransactionStatus::OpenUntilBlock; - status.open_for = wtx.nLockTime - nBestHeight + 1; + status.open_for = wtx.nLockTime - chainActive.Height() + 1; } else { @@ -221,7 +221,7 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx) bool TransactionRecord::statusUpdateNeeded() { - return status.cur_num_blocks != nBestHeight; + return status.cur_num_blocks != chainActive.Height(); } QString TransactionRecord::getTxID() const |