Merge 632be5514c into merged_master (Bitcoin PR bitcoin/bitcoin#23061)

This commit is contained in:
Byron Hambly 2023-04-24 10:40:48 +00:00
commit 14a2c59839
4 changed files with 9 additions and 3 deletions

View file

@ -4185,7 +4185,7 @@ bool BlockManager::LoadBlockIndexDB(std::set<CBlockIndex*, CBlockIndexWorkCompar
void CChainState::LoadMempool(const ArgsManager& args)
{
if (!m_mempool) return;
if (args.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
if (args.GetBoolArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
::LoadMempool(*m_mempool, *this);
}
m_mempool->SetIsLoaded(!ShutdownRequested());