Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/src/chain.cpp
+++ b/src/chain.cpp
@@ -81,7 +81,8 @@ CBlockIndex* CBlockIndex::GetAncestor(int height)

    CBlockIndex* pindexWalk = this;
    int heightWalk = nHeight;
-    while (heightWalk > height) {
+    while ( heightWalk > height && pindexWalk != 0 )
+    {
        int heightSkip = GetSkipHeight(heightWalk);
        int heightSkipPrev = GetSkipHeight(heightWalk - 1);
        if (pindexWalk->pskip != NULL &&