GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-18 13:17:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0c4ff18ee9 into merged_master (Bitcoin PR bitcoin/bitcoin#30896)

Browse source
This commit is contained in:
ivanlele 2026-03-26 09:38:46 +00:00
commit 7927bdcf2d
No known key found for this signature in database
4 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/init.cpp
View file

@ -309,7 +309,7 @@ void Shutdown(NodeContext& node)
StopTorControl();
if (node.chainman && node.chainman->m_thread_load.joinable()) node.chainman->m_thread_load.join();
if (node.background_init_thread.joinable()) node.background_init_thread.join();
// After everything has been shut down, but before things get flushed, stop the
// the scheduler. After this point, SyncWithValidationInterfaceQueue() should not be called anymore
// as this would prevent the shutdown from completing.
@ -1944,7 +1944,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
vImportFiles.push_back(fs::PathFromString(strFile));
}
chainman.m_thread_load = std::thread(&util::TraceThread, "initload", [=, &chainman, &args, &node] {
node.background_init_thread = std::thread(&util::TraceThread, "initload", [=, &chainman, &args, &node] {
ScheduleBatchPriority();
// Import blocks
ImportBlocks(chainman, vImportFiles);