diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-23 14:41:17 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-23 14:41:30 +0200 |
| commit | c719cefc417cc578f48b33069b764339a61054ce (patch) | |
| tree | 9d637db7808526596c4409d9ba6cc9aca9004b76 | |
| parent | 2a1090d4f55c307ddf50639cdedf329de1f5a02a (diff) | |
| parent | d3b09f6bac738958b6bf5711bcb5291049b7466d (diff) | |
Merge pull request #6856
d3b09f6 Do not allow blockfile pruning during reindex. (Alex Morcos)
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp index 5c961a3ad9..dd9259d4c9 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -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(); } } diff --git a/src/main.cpp b/src/main.cpp index 2bcb553098..30df2744a3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1899,7 +1899,7 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) { std::set<int> setFilesToPrune; bool fFlushForPrune = false; try { - if (fPruneMode && fCheckForPruning) { + if (fPruneMode && fCheckForPruning && !fReindex) { FindFilesToPrune(setFilesToPrune); fCheckForPruning = false; if (!setFilesToPrune.empty()) { |