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/init.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/init.cpp')
| -rw-r--r-- | src/init.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index a224b336ce..b68ca1cf1a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -345,7 +345,7 @@ void ThreadImport(void *data) { if (fReindex) { CImportingNow imp; int nFile = 0; - while (!fShutdown) { + while (!fRequestShutdown) { CDiskBlockPos pos(nFile, 0); FILE *file = OpenBlockFile(pos, true); if (!file) @@ -354,7 +354,7 @@ void ThreadImport(void *data) { LoadExternalBlockFile(file, &pos); nFile++; } - if (!fShutdown) { + if (!fRequestShutdown) { pblocktree->WriteReindexing(false); fReindex = false; printf("Reindexing finished\n"); @@ -363,7 +363,7 @@ void ThreadImport(void *data) { // hardcoded $DATADIR/bootstrap.dat filesystem::path pathBootstrap = GetDataDir() / "bootstrap.dat"; - if (filesystem::exists(pathBootstrap) && !fShutdown) { + if (filesystem::exists(pathBootstrap) && !fRequestShutdown) { FILE *file = fopen(pathBootstrap.string().c_str(), "rb"); if (file) { CImportingNow imp; @@ -376,7 +376,7 @@ void ThreadImport(void *data) { // -loadblock= BOOST_FOREACH(boost::filesystem::path &path, import->vFiles) { - if (fShutdown) + if (fRequestShutdown) break; FILE *file = fopen(path.string().c_str(), "rb"); if (file) { |