Merge pull request #6129

laanwj · laanwj · commit 2a822987dd71 · 2015-05-15T17:32:54.000+02:00
c208040 Fix for clearing fCheckForPruning (Alex Morcos)
diff --git a/src/main.cpp b/src/main.cpp
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -1886,6 +1886,7 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) {`
`1886`	`1886`	`try {`
`1887`	`1887`	`if (fPruneMode && fCheckForPruning) {`
`1888`	`1888`	`FindFilesToPrune(setFilesToPrune);`
	`1889`	`+ fCheckForPruning = false;`
`1889`	`1890`	`if (!setFilesToPrune.empty()) {`
`1890`	`1891`	`fFlushForPrune = true;`
`1891`	`1892`	`if (!fHavePruned) {`
`@@ -1942,10 +1943,8 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) {`
`1942`	`1943`	`}`
`1943`	`1944`	`}`
`1944`	`1945`	`// Finally remove any pruned files`
`1945`		`- if (fFlushForPrune) {`
	`1946`	`+ if (fFlushForPrune)`
`1946`	`1947`	`UnlinkPrunedFiles(setFilesToPrune);`
`1947`		`- fCheckForPruning = false;`
`1948`		`- }`
`1949`	`1948`	`nLastWrite = nNow;`
`1950`	`1949`	`}`
`1951`	`1950`	`// Flush best chain related state. This can only be done if the blocks / block index write was also done.`