zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent 62af164638 79f755db41
commit 434e683f7b
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/init.cpp
View File

@ -601,6 +601,8 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
{ {
const CChainParams& chainparams = Params(); const CChainParams& chainparams = Params();
RenameThread("bitcoin-loadblk"); RenameThread("bitcoin-loadblk");
{
CImportingNow imp; CImportingNow imp;
// -reindex // -reindex
@ -660,7 +662,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
LogPrintf("Stopping after block import\n"); LogPrintf("Stopping after block import\n");
StartShutdown(); StartShutdown();
} }
} // End scope of CImportingNow
LoadMempool(); LoadMempool();
} }