Merge #9133: Unset fImporting for loading mempool
79f755d
Unset fImporting for loading mempool (Alex Morcos)
This commit is contained in:
commit
434e683f7b
1 changed files with 3 additions and 1 deletions
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue