Merge pull request #1980 from sipa/noreorgsame

Do not reorganize if new branch has same amount of work
12 years ago · c07a1a6ee4
1 changed files with 1 additions and 1 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@ -1198,7 +1198,7 @@ bool ConnectBestBlock() {
				@@ -1198,7 +1198,7 @@ bool ConnectBestBlock() {
            pindexNewBest = *it;
        }

-        if (pindexNewBest == pindexBest)
+        if (pindexNewBest == pindexBest || (pindexBest && pindexNewBest->bnChainWork == pindexBest->bnChainWork))
            return true; // nothing to do

        // check ancestry