Merge #9133: Unset fImporting for loading mempool

79f755d Unset fImporting for loading mempool (Alex Morcos)
This commit is contained in:
Wladimir J. van der Laan 2016-11-16 10:11:35 +01:00
commit 434e683f7b
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -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();
}