diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-16 10:11:35 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-11-16 10:11:41 +0100 |
| commit | 434e683f7be62ec68da77c23d44af455ad4229aa (patch) | |
| tree | 0564a0718fc2e88da0e968bfea8e1b2509773d38 /src | |
| parent | 62af16463833076b98ebef4cef2a342835f22617 (diff) | |
| parent | 79f755db4114ad25c6f856c9a07e7101f2044af3 (diff) | |
| download | bitcoin-434e683f7be62ec68da77c23d44af455ad4229aa.tar.xz | |
Merge #9133: Unset fImporting for loading mempool
79f755d Unset fImporting for loading mempool (Alex Morcos)
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/init.cpp b/src/init.cpp index 31e3efb459..b5606069e1 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -601,6 +601,8 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles) { const CChainParams& chainparams = Params(); RenameThread("bitcoin-loadblk"); + + { CImportingNow imp; // -reindex @@ -660,7 +662,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles) LogPrintf("Stopping after block import\n"); StartShutdown(); } - + } // End scope of CImportingNow LoadMempool(); } |