wallet: Interrupt rescan on shutdown request

promag · promag · commit c4fda7672a97 · 2018-05-02T11:58:02.000+01:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -11,6 +11,7 @@
 #include <consensus/consensus.h>
 #include <consensus/validation.h>
 #include <fs.h>
+#include <init.h>
 #include <key.h>
 #include <key_io.h>
 #include <keystore.h>
@@ -1753,7 +1754,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock
             dProgressTip = GuessVerificationProgress(chainParams.TxData(), tip);
         }
         double gvp = dProgressStart;
-        while (pindex && !fAbortRescan)
+        while (pindex && !fAbortRescan && !ShutdownRequested())
         {
             if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0) {
                 ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((gvp - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
@@ -1794,6 +1795,8 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock
         }
         if (pindex && fAbortRescan) {
             LogPrintf("Rescan aborted at block %d. Progress=%f\n", pindex->nHeight, gvp);
+        } else if (pindex && ShutdownRequested()) {
+            LogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", pindex->nHeight, gvp);
         }
         ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI
     }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`#include <consensus/consensus.h>`
`12`	`12`	`#include <consensus/validation.h>`
`13`	`13`	`#include <fs.h>`
	`14`	`+#include <init.h>`
`14`	`15`	`#include <key.h>`
`15`	`16`	`#include <key_io.h>`
`16`	`17`	`#include <keystore.h>`
`@@ -1753,7 +1754,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock`
`1753`	`1754`	`dProgressTip = GuessVerificationProgress(chainParams.TxData(), tip);`
`1754`	`1755`	`}`
`1755`	`1756`	`double gvp = dProgressStart;`
`1756`		`- while (pindex && !fAbortRescan)`
	`1757`	`+ while (pindex && !fAbortRescan && !ShutdownRequested())`
`1757`	`1758`	`{`
`1758`	`1759`	`if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0) {`
`1759`	`1760`	`ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((gvp - dProgressStart) / (dProgressTip - dProgressStart) * 100))));`
`@@ -1794,6 +1795,8 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, CBlock`
`1794`	`1795`	`}`
`1795`	`1796`	`if (pindex && fAbortRescan) {`
`1796`	`1797`	`LogPrintf("Rescan aborted at block %d. Progress=%f\n", pindex->nHeight, gvp);`
	`1798`	`+ } else if (pindex && ShutdownRequested()) {`
	`1799`	`+ LogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", pindex->nHeight, gvp);`
`1797`	`1800`	`}`
`1798`	`1801`	`ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI`
`1799`	`1802`	`}`