aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2012-03-20 16:41:36 +0100
committerPieter Wuille <pieter.wuille@gmail.com>2012-03-20 16:41:36 +0100
commit9aa459b2947d2db3f09a6558fee80a444e1220bb (patch)
treee2e8e62391d729fd0316d13e38d875bbf307bcc7 /src
parent4ac3eea02733e10f4f8ed2f3d0ac389e9e851435 (diff)
downloadbitcoin-9aa459b2947d2db3f09a6558fee80a444e1220bb.tar.xz
assertion in CBlock::SetBestChainInner was too strong
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 1b56cead3c..1209f6e568 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1457,10 +1457,9 @@ runCommand(std::string strCommand)
printf("runCommand error: system(%s) returned %d\n", strCommand.c_str(), nErr);
}
+// Called from inside SetBestChain: attaches a block to the new best chain being built
bool CBlock::SetBestChainInner(CTxDB& txdb, CBlockIndex *pindexNew)
{
- assert(pindexNew->pprev == pindexBest);
-
uint256 hash = GetHash();
// Adding to current best branch