From 29ec7b5fb69a2fbadc8b424d43137e4077af2965 Mon Sep 17 00:00:00 2001
From: Duke Leto <duke@leto.net>
Date: Mon, 17 Oct 2022 07:13:50 -0400
Subject: [PATCH] Set rescanStartHeight before we lock cs_main + cs_wallet

---
 src/wallet/wallet.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 0f8ee8a68..9e8cd1aa4 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2762,6 +2762,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
 
     pwalletMain->fRescanning = true;
     CBlockIndex* pindex = pindexStart;
+    pwalletMain->rescanStartHeight = pindex->GetHeight();
     {
         LOCK2(cs_main, cs_wallet);
 
@@ -2774,7 +2775,6 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
         double dProgressStart = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false);
         double dProgressTip = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.LastTip(), false);
 
-        pwalletMain->rescanStartHeight = pindex->GetHeight();
         while (pindex)
         {
             pwalletMain->rescanHeight = pindex->GetHeight();