diff options
| author | Alex Morcos <morcos@chaincode.com> | 2015-10-19 14:43:04 -0400 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-23 14:42:05 +0200 |
| commit | dfe55bdc32b5333dcce1a7f2c74628f64028d1fe (patch) | |
| tree | 35fd452b673b6a75474356a607438d0385939450 | |
| parent | fc7f0ee28caca472d527ecd208d7012a42d94ad9 (diff) | |
| download | bitcoin-dfe55bdc32b5333dcce1a7f2c74628f64028d1fe.tar.xz | |
Do not allow blockfile pruning during reindex.
Also clarify startup message.
Github-Pull: #6856
Rebased-From: d3b09f6bac738958b6bf5711bcb5291049b7466d
| -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 e352d58ec4..a04e4e0a94 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1369,10 +1369,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 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()) { |