cryptogera/dogecoin
1
0
Fork 0
mirror of https://github.com/dogecoin/dogecoin.git synced 2026-02-14 09:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2434 from patricklodder/1.14-activatebestchain-shutdown-fix

Browse Source 
bugfix: break ActivateBestChain() differently on shutdown
This commit is contained in:
Ross Nicoll 2021-08-04 09:28:08 +01:00 committed by GitHub
commit 7ebedc2aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/validation.cpp
View File

@ -2504,9 +2504,6 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
CBlockIndex *pindexMostWork = NULL;
CBlockIndex *pindexNewTip = NULL;
do {
boost::this_thread::interruption_point();
if (ShutdownRequested())
break;
const CBlockIndex *pindexFork;
ConnectTrace connectTrace;
@ -2566,6 +2563,15 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
if (pindexFork != pindexNewTip) {
uiInterface.NotifyBlockTip(fInitialDownload, pindexNewTip);
}
// Perform the shutdown detection to the end of the loop to prevent
// pindexNewTip being nil
boost::this_thread::interruption_point();
if (ShutdownRequested()) {
LogPrintf("ActivateBestChain: shutdown requested, breaking loop\n");
break;
}
} while (pindexNewTip != pindexMostWork);
CheckBlockIndex(chainparams.GetConsensus(pindexNewTip->nHeight));