diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-02-15 14:31:07 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-02-15 14:33:27 +0100 |
| commit | 737ed8bb77d19b939e8d10e0d6555a4ddcaba9d8 (patch) | |
| tree | 8ddcad24a9eedd18e7031421fcdfe0655fb3713c /src | |
| parent | ae0fbf09817fc2f28567d1ffa6b55b7fb8d23df0 (diff) | |
| parent | 2e9406c0c588ddf6f039fd3ff73c978177483869 (diff) | |
| download | bitcoin-737ed8bb77d19b939e8d10e0d6555a4ddcaba9d8.tar.xz | |
Merge #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
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp index b28baba779..895a5358f4 100644 --- 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)) { |