From 61c2090dd63b2728d37fa6c3225d3560374f3359 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sat, 7 Mar 2020 17:48:34 -0500 Subject: [PATCH] Make the compiler Elder Gods happy --- src/init.cpp | 2 +- src/validationinterface.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 18c10d698..fccc16f6e 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -2143,7 +2143,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) LogPrintf("mapBlockIndex.size() = %u\n", mapBlockIndex.size()); LogPrintf("nBestHeight = %d\n", chainActive.Height()); #ifdef ENABLE_WALLET - RescanWallets(); + //RescanWallets(); LogPrintf("setKeyPool.size() = %u\n", pwalletMain ? pwalletMain->setKeyPool.size() : 0); LogPrintf("mapWallet.size() = %u\n", pwalletMain ? pwalletMain->mapWallet.size() : 0); diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp index 1c2d39495..799a60ceb 100644 --- a/src/validationinterface.cpp +++ b/src/validationinterface.cpp @@ -174,7 +174,7 @@ void ThreadNotifyWallets(CBlockIndex *pindexLastTip) while (pindexLastTip && pindexLastTip != pindexFork) { // Read block from disk. CBlock block; - if (!ReadBlockFromDisk(block, pindexLastTip, chainParams.GetConsensus())) { + if (!ReadBlockFromDisk(block, pindexLastTip,1)) { LogPrintf("*** %s\n", "Failed to read block while notifying wallets of block disconnects"); uiInterface.ThreadSafeMessageBox( _("Error: A fatal internal error occurred, see debug.log for details"), @@ -201,7 +201,7 @@ void ThreadNotifyWallets(CBlockIndex *pindexLastTip) // Read block from disk. CBlock block; - if (!ReadBlockFromDisk(block, blockData.pindex, chainParams.GetConsensus())) { + if (!ReadBlockFromDisk(block, blockData.pindex, 1)) { LogPrintf("*** %s\n", "Failed to read block while notifying wallets of block connects"); uiInterface.ThreadSafeMessageBox( _("Error: A fatal internal error occurred, see debug.log for details"),