fixup! Return errors from importmulti if complete rescans are not successful

ryanofsky · ryanofsky · commit d6f6a23c7092 · 2017-02-16T13:58:39.000-05:00
Skip empty loop if ReadBlockFromDisk fails as suggested #9773 (comment)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1574,15 +1574,15 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool f
                 ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((GuessVerificationProgress(chainParams.TxData(), pindex) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
 
             CBlock block;
-            if (!ReadBlockFromDisk(block, pindex, Params().GetConsensus())) {
+            if (ReadBlockFromDisk(block, pindex, Params().GetConsensus())) {
+                for (size_t posInBlock = 0; posInBlock < block.vtx.size(); ++posInBlock) {
+                    AddToWalletIfInvolvingMe(*block.vtx[posInBlock], pindex, posInBlock, fUpdate);
+                }
+                if (!ret) {
+                    ret = pindex;
+                }
+            } else {
                 ret = nullptr;
-            } else if (!ret) {
-                ret = pindex;
-            }
-            int posInBlock;
-            for (posInBlock = 0; posInBlock < (int)block.vtx.size(); posInBlock++)
-            {
-                AddToWalletIfInvolvingMe(*block.vtx[posInBlock], pindex, posInBlock, fUpdate);
             }
             pindex = chainActive.Next(pindex);
             if (GetTime() >= nNow + 60) {
