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:
Wladimir J. van der Laan 2016-04-07 12:59:02 +02:00
commit bbaf5976af
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -2877,6 +2877,8 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
CBlockIndex *pindexMostWork = NULL;
do {
boost::this_thread::interruption_point();
if (ShutdownRequested())
break;
CBlockIndex *pindexNewTip = NULL;
const CBlockIndex *pindexFork;