Merge pull request #6129
c208040
Fix for clearing fCheckForPruning (Alex Morcos)
This commit is contained in:
commit
2a822987dd
1 changed files with 2 additions and 3 deletions
|
@ -1886,6 +1886,7 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) {
|
|||
try {
|
||||
if (fPruneMode && fCheckForPruning) {
|
||||
FindFilesToPrune(setFilesToPrune);
|
||||
fCheckForPruning = false;
|
||||
if (!setFilesToPrune.empty()) {
|
||||
fFlushForPrune = true;
|
||||
if (!fHavePruned) {
|
||||
|
@ -1942,10 +1943,8 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) {
|
|||
}
|
||||
}
|
||||
// Finally remove any pruned files
|
||||
if (fFlushForPrune) {
|
||||
if (fFlushForPrune)
|
||||
UnlinkPrunedFiles(setFilesToPrune);
|
||||
fCheckForPruning = false;
|
||||
}
|
||||
nLastWrite = nNow;
|
||||
}
|
||||
// Flush best chain related state. This can only be done if the blocks / block index write was also done.
|
||||
|
|
Loading…
Reference in a new issue