diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-07 12:59:02 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-07 12:59:10 +0200 |
| commit | bbaf5976af84a730eab1d01a71443f9171837896 (patch) | |
| tree | 8aad26f8ad8477e1ab47438f1630e08e3c842a79 /src | |
| parent | 3bc71e1572cbe2e1f85bd487c77a63c46cf4b5bb (diff) | |
| parent | 07398e8e9d2ef807e63abd0978a6e98549bdf271 (diff) | |
| download | bitcoin-bbaf5976af84a730eab1d01a71443f9171837896.tar.xz | |
Merge #7821: init: allow shutdown during 'Activating best chain...'
07398e8 init: allow shutdown during 'Activating best chain...' (Wladimir J. van der Laan)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index b68c6affae..c1137c9b1f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2877,6 +2877,8 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams, CBlockIndex *pindexMostWork = NULL; do { boost::this_thread::interruption_point(); + if (ShutdownRequested()) + break; CBlockIndex *pindexNewTip = NULL; const CBlockIndex *pindexFork; |