Set rescanStartHeight before we lock cs_main + cs_wallet
This commit is contained in:
@@ -2762,6 +2762,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate)
|
|||||||
|
|
||||||
pwalletMain->fRescanning = true;
|
pwalletMain->fRescanning = true;
|
||||||
CBlockIndex* pindex = pindexStart;
|
CBlockIndex* pindex = pindexStart;
|
||||||
|
pwalletMain->rescanStartHeight = pindex->GetHeight();
|
||||||
{
|
{
|
||||||
LOCK2(cs_main, cs_wallet);
|
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 dProgressStart = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), pindex, false);
|
||||||
double dProgressTip = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.LastTip(), false);
|
double dProgressTip = Checkpoints::GuessVerificationProgress(chainParams.Checkpoints(), chainActive.LastTip(), false);
|
||||||
|
|
||||||
pwalletMain->rescanStartHeight = pindex->GetHeight();
|
|
||||||
while (pindex)
|
while (pindex)
|
||||||
{
|
{
|
||||||
pwalletMain->rescanHeight = pindex->GetHeight();
|
pwalletMain->rescanHeight = pindex->GetHeight();
|
||||||
|
|||||||
Reference in New Issue
Block a user