Merge branch 'dev' into jl777

2018-04-20 09:32:24 +03:00
parent 02290a3fd8 0a4ffaff30
commit 74d30ec279
11 changed files with 41 additions and 48 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4244,7 +4244,6 @@ void FindFilesToPrune(std::set<int>& setFilesToPrune)
    if (chainActive.Tip()->nHeight <= Params().PruneAfterHeight()) {
        return;
    }
-    
    unsigned int nLastBlockWeCanPrune = chainActive.Tip()->nHeight - MIN_BLOCKS_TO_KEEP;
    uint64_t nCurrentUsage = CalculateCurrentUsage();
    // We don't check to prune until after we've allocated new space for files