Skip to content

Commit 4cd1991

Browse files
laanwjcodablock
authored andcommitted
Merge bitcoin#10998: Fix upgrade cancel warnings
861f9a2 Skip remainder of init if upgrade is cancelled (Matt Corallo) Pull request description: Based on bitcoin#10919. Without this, if you cancel upgrade, you get a needless error: ERROR: VerifyDB(): *** irrecoverable inconsistency in block data at Tree-SHA512: aa47665682c6605ada376f1c100ce17cf8c4312427929eb2e75306f2199b47cbcdb4e0d98d5efcfefff03947b2c0fcbd3aab487a4ed14d50607df685c91a03d0
1 parent 8780c76 commit 4cd1991

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/txdb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,5 +509,5 @@ bool CCoinsViewDB::Upgrade() {
509509
db.CompactRange({DB_COINS, uint256()}, key);
510510
uiInterface.SetProgressBreakAction(std::function<void(void)>());
511511
LogPrintf("[%s].\n", ShutdownRequested() ? "CANCELLED" : "DONE");
512-
return true;
512+
return !ShutdownRequested();
513513
}

0 commit comments

Comments
 (0)