Merge upstream pull request xpc-wg#95

naomi-mcrn · Jul 30, 2019 · 467facb · 467facb
2 parents 4cca090 + 092c9e3
commit 467facb
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -20,6 +20,7 @@
 #include <pow.h>
 #include <primitives/transaction.h>
 #include <script/standard.h>
+#include <shutdown.h>
 #include <timedata.h>
 #include <util.h>
 #include <utilmoneystr.h>
@@ -717,6 +718,12 @@ void BitcoinMinter(const std::shared_ptr<CWallet>& wallet)
             }
 
             for (COutput coin : vCoins) {
+
+                // check : Is wallet shutting down
+                if(ShutdownRequested()){
+                    return;
+                }
+
                 CBlockIndex* pprevIndex;
                 if(!GetPrevBlockIndex(coin, &pprevIndex)){
                     continue;