diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-12-12 09:10:44 -0800 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-12-12 09:10:44 -0800 |
| commit | 8b83e2fc2e7440c49902babc7d89b629f8651ad8 (patch) | |
| tree | cec7b380453644d70fe67c5af0e370d19fb72bbf /src/main.cpp | |
| parent | 59b8a869ab5c2b84ecd8f8624a955438b5f8679f (diff) | |
| parent | 3fb9b99cca390e8ac5838c03363c46a99396e463 (diff) | |
| download | bitcoin-8b83e2fc2e7440c49902babc7d89b629f8651ad8.tar.xz | |
Merge pull request #2074 from sipa/minor
Two minor inconvenience fixes
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index 8edc25c789..177dbfe0c8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1240,9 +1240,12 @@ bool ConnectBestBlock() { if (pindexTest->pprev == NULL || pindexTest->pnext != NULL) { reverse(vAttach.begin(), vAttach.end()); - BOOST_FOREACH(CBlockIndex *pindexSwitch, vAttach) + BOOST_FOREACH(CBlockIndex *pindexSwitch, vAttach) { + if (fRequestShutdown) + break; if (!SetBestChain(pindexSwitch)) return false; + } return true; } pindexTest = pindexTest->pprev; @@ -1897,6 +1900,7 @@ bool FindBlockPos(CDiskBlockPos &pos, unsigned int nAddSize, unsigned int nHeigh nLastBlockFile = pos.nFile; infoLastBlockFile.SetNull(); pblocktree->ReadBlockFileInfo(nLastBlockFile, infoLastBlockFile); + fUpdatedLast = true; } } else { while (infoLastBlockFile.nSize + nAddSize >= MAX_BLOCKFILE_SIZE) { @@ -2556,7 +2560,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp) } } uint64 nRewind = blkdat.GetPos(); - while (blkdat.good() && !blkdat.eof() && !fShutdown) { + while (blkdat.good() && !blkdat.eof() && !fRequestShutdown) { blkdat.SetPos(nRewind); nRewind++; // start one byte further next time, in case of failure blkdat.SetLimit(); // remove former limit |