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 c92fd63886 into merged_master (Bitcoin PR bitcoin/bitcoin#27708)

Browse source
This commit is contained in:
Byron Hambly 2025-06-27 14:01:27 +02:00
commit 30814e6064
14 changed files with 85 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/init.cpp
View file

@ -856,7 +856,7 @@ std::set<BlockFilterType> g_enabled_filter_types;
std::terminate();
};
bool AppInitBasicSetup(const ArgsManager& args)
bool AppInitBasicSetup(const ArgsManager& args, std::atomic<int>& exit_status)
{
// ********************************************************* Step 1: setup
#ifdef _MSC_VER
@ -870,7 +870,7 @@ bool AppInitBasicSetup(const ArgsManager& args)
// Enable heap terminate-on-corruption
HeapSetInformation(nullptr, HeapEnableTerminationOnCorruption, nullptr, 0);
#endif
if (!InitShutdownState()) {
if (!InitShutdownState(exit_status)) {
return InitError(Untranslated("Initializing wait-for-shutdown state failed."));
}