aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2015-10-19 14:43:04 -0400
committerWladimir J. van der Laan <laanwj@gmail.com>2015-10-23 14:42:05 +0200
commitdfe55bdc32b5333dcce1a7f2c74628f64028d1fe (patch)
tree35fd452b673b6a75474356a607438d0385939450 /src/main.cpp
parentfc7f0ee28caca472d527ecd208d7012a42d94ad9 (diff)
downloadbitcoin-dfe55bdc32b5333dcce1a7f2c74628f64028d1fe.tar.xz
Do not allow blockfile pruning during reindex.
Also clarify startup message. Github-Pull: #6856 Rebased-From: d3b09f6bac738958b6bf5711bcb5291049b7466d
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 e57fdb8c83..621fd720e6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2000,7 +2000,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()) {