diff options
| author | Karl-Johan Alm <karljohan-alm@garage.co.jp> | 2017-04-24 08:48:12 +0900 |
|---|---|---|
| committer | Karl-Johan Alm <karljohan-alm@garage.co.jp> | 2017-04-25 16:18:52 +0900 |
| commit | c36ea693ee16611e0337aec682d1ce80b90e1bd3 (patch) | |
| tree | 54152a155c86038188dd95f22b355d1a1fa7ff18 /src | |
| parent | 1b25b6df0f08f7474228c5b6ed13b58682e1e440 (diff) | |
| download | bitcoin-c36ea693ee16611e0337aec682d1ce80b90e1bd3.tar.xz | |
[wallet] Make sure pindex is non-null before possibly referencing in LogPrintf call.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 33dd30a795..7db4874efc 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1544,6 +1544,10 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool f { if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0) ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((GuessVerificationProgress(chainParams.TxData(), pindex) - dProgressStart) / (dProgressTip - dProgressStart) * 100)))); + if (GetTime() >= nNow + 60) { + nNow = GetTime(); + LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex)); + } CBlock block; if (ReadBlockFromDisk(block, pindex, Params().GetConsensus())) { @@ -1557,10 +1561,6 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool f ret = nullptr; } pindex = chainActive.Next(pindex); - if (GetTime() >= nNow + 60) { - nNow = GetTime(); - LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex)); - } } if (pindex && fAbortRescan) { LogPrintf("Rescan aborted at block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex)); |