Added ability to respond to signals during Block Loading stage.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/db.cpp b/src/db.cpp
index c38070f347..39a41894d7 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -529,7 +529,7 @@ bool CTxDB::LoadBlockIndex()
         // Unserialize
         string strType;
         ssKey >> strType;
-        if (strType == "blockindex")
+        if (strType == "blockindex" && !fRequestShutdown)
         {
             CDiskBlockIndex diskindex;
             ssValue >> diskindex;
@@ -556,11 +556,14 @@ bool CTxDB::LoadBlockIndex()
         }
         else
         {
-            break;
+            break; // if shutdown requested or finished loading block index
         }
     }
     pcursor->close();
 
+    if (fRequestShutdown)
+        return true;
+
     // Calculate bnChainWork
     vector<pair<int, CBlockIndex*> > vSortedByHeight;
     vSortedByHeight.reserve(mapBlockIndex.size());