Merge 3f205808a5 into merged_master (Bitcoin PR #20605)

This commit is contained in:
Andrew Poelstra 2021-06-14 18:26:20 +00:00
commit 40b55f89b0
4 changed files with 112 additions and 14 deletions

View file

@ -970,6 +970,9 @@ bool AppInitBasicSetup(const ArgsManager& args)
// Enable heap terminate-on-corruption
HeapSetInformation(nullptr, HeapEnableTerminationOnCorruption, nullptr, 0);
#endif
if (!InitShutdownState()) {
return InitError(Untranslated("Initializing wait-for-shutdown state failed."));
}
if (!SetupNetworking()) {
return InitError(Untranslated("Initializing networking failed."));