aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-10-23 14:41:17 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-10-23 14:41:30 +0200
commitc719cefc417cc578f48b33069b764339a61054ce (patch)
tree9d637db7808526596c4409d9ba6cc9aca9004b76 /src/main.cpp
parent2a1090d4f55c307ddf50639cdedf329de1f5a02a (diff)
parentd3b09f6bac738958b6bf5711bcb5291049b7466d (diff)
downloadbitcoin-c719cefc417cc578f48b33069b764339a61054ce.tar.xz
Merge pull request #6856
d3b09f6 Do not allow blockfile pruning during reindex. (Alex Morcos)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
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()) {