GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 399a0d9dc7 into merged_master (Bitcoin PR #19180)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:00 +00:00
commit 30e68e5e34
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/init.cpp
View file

@ -18,6 +18,7 @@
#include <compat/sanity.h>
#include <consensus/validation.h>
#include <fs.h>
#include <hash.h>
#include <httprpc.h>
#include <httpserver.h>
#include <index/blockfilterindex.h>
@ -43,6 +44,7 @@
#include <script/sigcache.h>
#include <script/standard.h>
#include <shutdown.h>
#include <sync.h>
#include <timedata.h>
#include <torcontrol.h>
#include <txdb.h>
@ -54,8 +56,6 @@
#include <util/system.h>
#include <util/threadnames.h>
#include <util/translation.h>
#include <hash.h>
#include <validationinterface.h>
#include <walletinitinterface.h>
@ -174,11 +174,10 @@ void Interrupt(NodeContext& node)
void Shutdown(NodeContext& node)
{
static Mutex g_shutdown_mutex;
TRY_LOCK(g_shutdown_mutex, lock_shutdown);
if (!lock_shutdown) return;
LogPrintf("%s: In progress...\n", __func__);
static RecursiveMutex cs_Shutdown;
TRY_LOCK(cs_Shutdown, lockShutdown);
if (!lockShutdown)
return;
/// Note: Shutdown() must be able to handle cases in which initialization failed part of the way,
/// for example if the data directory was found to be locked.