Unset fImporting for loading mempool

morcos · morcos · commit 79f755db4114 · 2016-11-11T09:33:16.000-05:00
diff --git 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();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -601,6 +601,8 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)`
`601`	`601`	`{`
`602`	`602`	`const CChainParams& chainparams = Params();`
`603`	`603`	`RenameThread("bitcoin-loadblk");`
	`604`	`+`
	`605`	`+ {`
`604`	`606`	`CImportingNow imp;`
`605`	`607`
`606`	`608`	`// -reindex`
`@@ -660,7 +662,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)`
`660`	`662`	`LogPrintf("Stopping after block import\n");`
`661`	`663`	`StartShutdown();`
`662`	`664`	`}`
`663`		`-`
	`665`	`+ } // End scope of CImportingNow`
`664`	`666`	`LoadMempool();`
`665`	`667`	`}`
`666`	`668`