Merge bitcoin#12415: Interrupt loading thread after shutdown request

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
PastaPastaPasta · Mar 14, 2020 · 6ecc8dc · 6ecc8dc
1 parent 8b13a95
commit 6ecc8dc
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -798,11 +798,13 @@ void ThreadImport(std::vector<fs::path> vImportFiles)
     if (!ActivateBestChain(state, chainparams)) {
         LogPrintf("Failed to connect best block (%s)\n", FormatStateMessage(state));
         StartShutdown();
+        return;
     }
 
     if (gArgs.GetBoolArg("-stopafterblockimport", DEFAULT_STOPAFTERBLOCKIMPORT)) {
         LogPrintf("Stopping after block import\n");
         StartShutdown();
+        return;
     }
     } // End scope of CImportingNow