Merge #12415: Interrupt loading thread after shutdown request

laanwj · laanwj · commit 737ed8bb77d1 · 2018-02-15T14:33:27.000+01:00
2e9406c Interrupt loading thread after shutdown request (João Barbosa) Pull request description: This change (currently) avoids loading the mempool if shutdown is requested. Tree-SHA512: 3dca3a6ea5b09bd71db0974584d93dfe81819bc0bdbb4d9b6fa0474755306d1403f6c058ecb8211384493a8f7ca3a9134173db744b7344043cfc7d79286c8fd4
diff --git a/src/init.cpp b/src/init.cpp
@@ -680,11 +680,13 @@ void ThreadImport(std::vector<fs::path> vImportFiles)
     if (!ActivateBestChain(state, chainparams)) {
         LogPrintf("Failed to connect best block");
         StartShutdown();
+        return;
     }
 
     if (gArgs.GetBoolArg("-stopafterblockimport", DEFAULT_STOPAFTERBLOCKIMPORT)) {
         LogPrintf("Stopping after block import\n");
         StartShutdown();
+        return;
     }
     } // End scope of CImportingNow
     if (gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {

Original file line number	Diff line number	Diff line change
`@@ -680,11 +680,13 @@ void ThreadImport(std::vector<fs::path> vImportFiles)`
`680`	`680`	`if (!ActivateBestChain(state, chainparams)) {`
`681`	`681`	`LogPrintf("Failed to connect best block");`
`682`	`682`	`StartShutdown();`
	`683`	`+ return;`
`683`	`684`	`}`
`684`	`685`
`685`	`686`	`if (gArgs.GetBoolArg("-stopafterblockimport", DEFAULT_STOPAFTERBLOCKIMPORT)) {`
`686`	`687`	`LogPrintf("Stopping after block import\n");`
`687`	`688`	`StartShutdown();`
	`689`	`+ return;`
`688`	`690`	`}`
`689`	`691`	`} // End scope of CImportingNow`
`690`	`692`	`if (gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {`