diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-19 07:27:25 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-19 07:27:25 -0800 |
| commit | 99a289f531e9dc42aa81ea32ff84b807a46b6a9c (patch) | |
| tree | a4d7f89dbfdb11aef1fe4b6644a1ba127d0e97f5 /src/main.cpp | |
| parent | fc90967876a0b8c762cba4a9f40a80db7a8b0432 (diff) | |
| parent | 95d888a6d1f659a5cb81124e0d97966b9de1f139 (diff) | |
| download | bitcoin-99a289f531e9dc42aa81ea32ff84b807a46b6a9c.tar.xz | |
Merge pull request #574 from sipa/dumpprivkey
Dumpprivkey
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 1da28d4d9f..052701e5fc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -521,7 +521,7 @@ bool CTransaction::RemoveFromMemoryPool() -int CMerkleTx::GetDepthInMainChain(int& nHeightRet) const +int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const { if (hashBlock == 0 || nIndex == -1) return 0; @@ -542,7 +542,7 @@ int CMerkleTx::GetDepthInMainChain(int& nHeightRet) const fMerkleVerified = true; } - nHeightRet = pindex->nHeight; + pindexRet = pindex; return pindexBest->nHeight - pindex->nHeight + 1; } |