aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Schnelli <jonas.schnelli@include7.ch>2015-04-29 13:30:16 +0200
committerJonas Schnelli <jonas.schnelli@include7.ch>2015-05-28 09:00:45 +0200
commit7e6569ea5be8cb26454ede3efb6a50b393aaa9be (patch)
treee408f1c97e6fa9717b1990e2e5a12ddcb3c410b4
parent7a12119d7a9084010725cf5b95bafcc3cf2c1d71 (diff)
downloadbitcoin-7e6569ea5be8cb26454ede3efb6a50b393aaa9be.tar.xz
[squashme] improve/corrects prune mode detection test for required wallet rescans
-rw-r--r--src/init.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp
index c102464ad9..24e7e1c04a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1318,7 +1318,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
if (fPruneMode)
{
CBlockIndex *block = chainActive.Tip();
- while (block && block->pprev && (block->pprev->nStatus & BLOCK_HAVE_DATA) && pindexRescan != block)
+ while (block && block->pprev && (block->pprev->nStatus & BLOCK_HAVE_DATA) && block->pprev->nTx > 0 && pindexRescan != block)
block = block->pprev;
if (pindexRescan != block)