Merge #7821: init: allow shutdown during 'Activating best chain...'
07398e8
init: allow shutdown during 'Activating best chain...' (Wladimir J. van der Laan)
This commit is contained in:
commit
bbaf5976af
1 changed files with 2 additions and 0 deletions
|
@ -2877,6 +2877,8 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
|
||||||
CBlockIndex *pindexMostWork = NULL;
|
CBlockIndex *pindexMostWork = NULL;
|
||||||
do {
|
do {
|
||||||
boost::this_thread::interruption_point();
|
boost::this_thread::interruption_point();
|
||||||
|
if (ShutdownRequested())
|
||||||
|
break;
|
||||||
|
|
||||||
CBlockIndex *pindexNewTip = NULL;
|
CBlockIndex *pindexNewTip = NULL;
|
||||||
const CBlockIndex *pindexFork;
|
const CBlockIndex *pindexFork;
|
||||||
|
|
Loading…
Reference in a new issue