Interrupt loading thread after shutdown request

promag · promag · commit 2e9406c0c588 · 2018-02-12T11:18:22.000Z
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)) {`