Merge ad2952d17a into merged_master (Bitcoin PR #19604)

This commit is contained in:
Andrew Poelstra 2020-11-26 22:45:20 +00:00
commit 59aa4e1fba
8 changed files with 27 additions and 36 deletions

View file

@ -1621,7 +1621,7 @@ bool AppInitMain(const util::Ref& context, NodeContext& node)
chainman.m_total_coinstip_cache = nCoinCacheUsage;
chainman.m_total_coinsdb_cache = nCoinDBCache;
UnloadBlockIndex();
UnloadBlockIndex(node.mempool);
// new CBlockTreeDB tries to delete the existing file, which
// fails if it's still open from the previous loop. Close it first: