DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #1166 from jl777/FSM

Browse Source 
FSM
This commit is contained in:
jl777
2019-01-09 04:33:27 -11:00
committed by GitHub
parent 0a9b09b7df e755fa0e7b
commit c91a1d27ff
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cpp
View File

@@ -4114,7 +4114,7 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
"- " + strprintf(_("Fork point: %s %s, height %d"), "- " + strprintf(_("Fork point: %s %s, height %d"),
ASSETCHAINS_SYMBOL,pindexFork->phashBlock->GetHex(), pindexFork->GetHeight()) + "\n\n" + ASSETCHAINS_SYMBOL,pindexFork->phashBlock->GetHex(), pindexFork->GetHeight()) + "\n\n" +
_("Please help, human!"); _("Please help, human!");
LogPrintf("*** %s\n", msg); LogPrintf("*** %s\nif you launch with -maxreorg=%d it might be able to resolve this automatically", msg,reorgLength+10);
uiInterface.ThreadSafeMessageBox(msg, "", CClientUIInterface::MSG_ERROR); uiInterface.ThreadSafeMessageBox(msg, "", CClientUIInterface::MSG_ERROR);
StartShutdown(); StartShutdown();
return false; return false;

4
src/wallet/wallet.cpp
View File

@@ -1203,8 +1203,8 @@ void CWallet::DecrementNoteWitnesses(const CBlockIndex* pindex)
else else
{ {
if ( nWitnessCacheSize > 0 ) if ( nWitnessCacheSize > 0 )
nWitnessCacheSize-- nWitnessCacheSize--;
} }
// For performance reasons, we write out the witness cache in // For performance reasons, we write out the witness cache in
// CWallet::SetBestChain() (which also ensures that overall consistency // CWallet::SetBestChain() (which also ensures that overall consistency
// of the wallet.dat is maintained). // of the wallet.dat is maintained).