Merge 7110d455eb into merged_master (Bitcoin PR #12980)

This commit is contained in:
Andrew Poelstra 2020-10-29 19:54:46 +00:00
commit 96169f79e3
3 changed files with 3 additions and 0 deletions

View file

@ -1586,6 +1586,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;
}