Merge pull request #6856

d3b09f6 Do not allow blockfile pruning during reindex. (Alex Morcos)
This commit is contained in:
Wladimir J. van der Laan
2015-10-23 14:41:17 +02:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1505,10 +1505,10 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
// if pruning, unset the service bit and perform the initial blockstore prune
// after any wallet rescanning has taken place.
if (fPruneMode) {
uiInterface.InitMessage(_("Pruning blockstore..."));
LogPrintf("Unsetting NODE_NETWORK on prune mode\n");
nLocalServices &= ~NODE_NETWORK;
if (!fReindex) {
uiInterface.InitMessage(_("Pruning blockstore..."));
PruneAndFlush();
}
}