diff options
| author | Pieter Wuille <[email protected]> | 2012-03-20 16:41:36 +0100 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2012-03-20 16:41:36 +0100 |
| commit | 9aa459b2947d2db3f09a6558fee80a444e1220bb (patch) | |
| tree | e2e8e62391d729fd0316d13e38d875bbf307bcc7 /src/main.cpp | |
| parent | Merge pull request #953 from Diapolo/master (diff) | |
| download | discoin-9aa459b2947d2db3f09a6558fee80a444e1220bb.tar.xz discoin-9aa459b2947d2db3f09a6558fee80a444e1220bb.zip | |
assertion in CBlock::SetBestChainInner was too strong
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 1b56cead3..1209f6e56 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 |