[squashme] improve/corrects prune mode detection test for required wallet rescans

jonasschnelli · jonasschnelli · commit 7e6569ea5be8 · 2015-05-28T09:00:45.000+02:00
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -1318,7 +1318,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)`
`1318`	`1318`	`if (fPruneMode)`
`1319`	`1319`	`{`
`1320`	`1320`	`CBlockIndex *block = chainActive.Tip();`
`1321`		`- while (block && block->pprev && (block->pprev->nStatus & BLOCK_HAVE_DATA) && pindexRescan != block)`
	`1321`	`+ while (block && block->pprev && (block->pprev->nStatus & BLOCK_HAVE_DATA) && block->pprev->nTx > 0 && pindexRescan != block)`
`1322`	`1322`	`block = block->pprev;`
`1323`	`1323`
`1324`	`1324`	`if (pindexRescan != block)`