diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-02-20 20:50:26 +0100 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-04-22 03:09:35 +0200 |
| commit | 1d740055daa6e1668f047186d208b0693c6b21ba (patch) | |
| tree | 1462b3f673bd286490b9b527381d3a91167b860c /src/db.cpp | |
| parent | 7dbe393629a263675ccfd6fce8e7fc12496c808a (diff) | |
| download | bitcoin-1d740055daa6e1668f047186d208b0693c6b21ba.tar.xz | |
-loadblock to load from an external blk000?.dat file
Diffstat (limited to 'src/db.cpp')
| -rw-r--r-- | src/db.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/db.cpp b/src/db.cpp index 39a41894d7..670f0a876c 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -608,7 +608,7 @@ bool CTxDB::LoadBlockIndex() map<pair<unsigned int, unsigned int>, CBlockIndex*> mapBlockPos; for (CBlockIndex* pindex = pindexBest; pindex && pindex->pprev; pindex = pindex->pprev) { - if (pindex->nHeight < nBestHeight-nCheckDepth) + if (fRequestShutdown || pindex->nHeight < nBestHeight-nCheckDepth) break; CBlock block; if (!block.ReadFromDisk(pindex)) @@ -710,7 +710,7 @@ bool CTxDB::LoadBlockIndex() } } } - if (pindexFork) + if (pindexFork && !fRequestShutdown) { // Reorg back to the fork printf("LoadBlockIndex() : *** moving best chain pointer back to block %d\n", pindexFork->nHeight); |