Merge branch 'beta' into dev

2018-04-17 23:58:53 +03:00
parent 8664be3a58 958190997f
commit ddd8e4744f
10 changed files with 28 additions and 30 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4261,7 +4261,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