[Trivial] Use error() instead of LogPrintf + return false.

furszy · furszy · commit eafe9cdbb5db · 2019-10-03T10:50:04.000-03:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -1747,8 +1747,7 @@ bool AppInit2()
             LogPrintf("Rescanning last %i blocks (from block %i)...\n", chainActive.Height() - pindexRescan->nHeight, pindexRescan->nHeight);
             const int64_t nWalletRescanTime = GetTimeMillis();
             if (pwalletMain->ScanForWalletTransactions(pindexRescan, true, true) == -1) {
-                LogPrintf("Shutdown requested over the txs scan. Exiting.\n");
-                return false;
+                return error("Shutdown requested over the txs scan. Exiting.");
             }
             LogPrintf("Rescan completed in %15dms\n", GetTimeMillis() - nWalletRescanTime);
             pwalletMain->SetBestChain(chainActive.GetLocator());
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1291,10 +1291,8 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate, b
             if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0)
                 ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((Checkpoints::GuessVerificationProgress(pindex, false) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
 
-            if (fromStartup) {
-                if (ShutdownRequested()) {
-                    return -1;
-                }
+            if (fromStartup && ShutdownRequested()) {
+                return -1;
             }
 
             CBlock block;
