Merge pull request #1963 from sipa/bugfix_nonewblock

Bugfix: don't crash by trying to write unchanged best block
This commit is contained in:
Pieter Wuille 2012-10-30 13:53:11 -07:00
commit 41db7c224a

View file

@ -58,7 +58,8 @@ bool CCoinsViewDB::BatchWrite(const std::map<uint256, CCoins> &mapCoins, CBlockI
CLevelDBBatch batch;
for (std::map<uint256, CCoins>::const_iterator it = mapCoins.begin(); it != mapCoins.end(); it++)
BatchWriteCoins(batch, it->first, it->second);
BatchWriteHashBestChain(batch, pindex->GetBlockHash());
if (pindex)
BatchWriteHashBestChain(batch, pindex->GetBlockHash());
return db.WriteBatch(batch);
}