Merge 951850bebf into merged_master (Bitcoin PR #22371)

This commit is contained in:
James Dorfman 2023-03-16 06:04:38 +00:00
commit 44df9bbb73
7 changed files with 24 additions and 29 deletions

View file

@ -531,7 +531,7 @@ void ThreadImport(ChainstateManager& chainman, std::vector<fs::path> vImportFile
}
nFile++;
}
pblocktree->WriteReindexing(false);
WITH_LOCK(::cs_main, chainman.m_blockman.m_block_tree_db->WriteReindexing(false));
fReindex = false;
LogPrintf("Reindexing finished\n");
// To avoid ending up in a situation without genesis block, re-try initializing (no-op if reindexing worked):