Merge pull request #1980 from sipa/noreorgsame

Do not reorganize if new branch has same amount of work
This commit is contained in:
Pieter Wuille 2012-11-22 13:33:03 -08:00
commit c07a1a6ee4

View file

@ -1198,7 +1198,7 @@ bool ConnectBestBlock() {
pindexNewBest = *it; pindexNewBest = *it;
} }
if (pindexNewBest == pindexBest) if (pindexNewBest == pindexBest || (pindexBest && pindexNewBest->bnChainWork == pindexBest->bnChainWork))
return true; // nothing to do return true; // nothing to do
// check ancestry // check ancestry