diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-08 11:58:26 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-08 11:58:31 +0200 |
| commit | 2507fd55568b361080e9127f40584af2df64f76e (patch) | |
| tree | 269b79142de26735a7f7101b8b5ad3fe17d5aad5 /src | |
| parent | 4268426b45001f12c69695c31b76af111e5336db (diff) | |
| parent | 861f9a28bcb2b7bcdb602d319a0fd844bf519a1d (diff) | |
| download | bitcoin-2507fd55568b361080e9127f40584af2df64f76e.tar.xz | |
Merge #10998: Fix upgrade cancel warnings
861f9a2 Skip remainder of init if upgrade is cancelled (Matt Corallo)
Pull request description:
Based on #10919.
Without this, if you cancel upgrade, you get a needless error:
ERROR: VerifyDB(): *** irrecoverable inconsistency in block data at
Tree-SHA512: aa47665682c6605ada376f1c100ce17cf8c4312427929eb2e75306f2199b47cbcdb4e0d98d5efcfefff03947b2c0fcbd3aab487a4ed14d50607df685c91a03d0
Diffstat (limited to 'src')
| -rw-r--r-- | src/txdb.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/txdb.cpp b/src/txdb.cpp index fd730c368a..7f7eb65673 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -422,5 +422,5 @@ bool CCoinsViewDB::Upgrade() { db.CompactRange({DB_COINS, uint256()}, key); uiInterface.SetProgressBreakAction(std::function<void(void)>()); LogPrintf("[%s].\n", ShutdownRequested() ? "CANCELLED" : "DONE"); - return true; + return !ShutdownRequested(); } |