diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2019-05-19 10:43:13 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2019-05-19 10:43:32 +0200 |
| commit | 7110d455eb51e78e09f43fabf0b1630ae997d898 (patch) | |
| tree | 0c0a7b72aaa6f303af170e56032bd525eeec7c18 /src/init.cpp | |
| parent | 387eb5b34307448f16d3769ac0245c4e3d996a38 (diff) | |
| parent | af5fa82b676a36e60eda080ca0a946bdfffefd49 (diff) | |
| download | bitcoin-7110d455eb51e78e09f43fabf0b1630ae997d898.tar.xz | |
Merge #12980: Allow quicker shutdowns during LoadBlockIndex()
af5fa82b6 Allow quicker shutdowns during LoadBlockIndex() (Jonas Schnelli)
Pull request description:
ACKs for commit af5fa8:
promag:
utACK af5fa82b676a36e60eda080ca0a946bdfffefd49.
practicalswift:
utACK af5fa82b676a36e60eda080ca0a946bdfffefd49
Tree-SHA512: 1c64dcc5d8a9d3411553257cd5a598dcd29be981660e5bca9283c1d957dc56798abcf41d9969cd573088137597a23e48e62a8c476c463d3f176b86a10048f47b
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp index 944200e24d..b4b4ccb654 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1522,6 +1522,7 @@ bool AppInitMain(InitInterfaces& interfaces) // Note that it also sets fReindex based on the disk flag! // From here on out fReindex and fReset mean something different! if (!LoadBlockIndex(chainparams)) { + if (ShutdownRequested()) break; strLoadError = _("Error loading block database"); break; } |