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 1c177c3a00 into merged_master (Bitcoin PR #16015)

Browse source
This commit is contained in:
Andrew Poelstra 2020-10-29 20:55:17 +00:00
commit a835ebdb2f
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/validation.cpp
View file

@ -4602,6 +4602,7 @@ bool RewindBlockIndex(const CChainParams& params) {
return false;
}
LOCK(cs_main);
if (::ChainActive().Tip() != nullptr) {
// FlushStateToDisk can possibly read ::ChainActive(). Be conservative
// and skip it here, we're about to -reindex-chainstate anyway, so