Merge #7815: Break circular dependency main ↔ txdb

99e7075 Break circular dependency main ↔ txdb (Wladimir J. van der Laan)
2016-05-06 10:02:57 +02:00
parent 006cdf64dc 99e70751f2
commit efee32f381
5 changed files with 87 additions and 89 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3705,7 +3705,7 @@ CBlockIndex * InsertBlockIndex(uint256 hash)
 bool static LoadBlockIndexDB()
 {
    const CChainParams& chainparams = Params();
-    if (!pblocktree->LoadBlockIndexGuts())
+    if (!pblocktree->LoadBlockIndexGuts(InsertBlockIndex))
        return false;

    boost::this_thread::interruption_point();