From 861f9a28bcb2b7bcdb602d319a0fd844bf519a1d Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sun, 6 Aug 2017 21:25:04 -0400
Subject: Skip remainder of init if upgrade is cancelled

---
 src/txdb.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();
 }
-- 
cgit v1.2.3