twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-22 12:34:24 +00:00
Code Issues Projects Releases Wiki Activity

partialy revert changeset 77d1a4fb. fixed one case (that -reindex would fix anyway) but broke another one.

Browse Source
This commit is contained in:
Miguel Freitas 2014-01-13 09:40:18 -02:00
parent 055240b2a9
commit 4c25acc6af
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clientversion.h
View File

@ -8,7 +8,7 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 9
#define CLIENT_VERSION_REVISION 02
#define CLIENT_VERSION_REVISION 03
#define CLIENT_VERSION_BUILD 0
// Set to true for release, false for prerelease or test build

10
src/main.cpp
View File

@ -1336,16 +1336,6 @@ bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew)
int64 nStart = GetTimeMicros();
if (!ConnectBlock(block, state, pindex, view)) {
if (state.IsInvalid()) {
// [MF] invalidate all pindex between pindexNew and pindex
// trying to fix infinite recursion in SetBestChain.
CBlockIndex *pinvalid = pindexNew;
do {
pinvalid->nStatus |= BLOCK_FAILED_CHILD;
pblocktree->WriteBlockIndex(CDiskBlockIndex(pinvalid));
setBlockIndexValid.erase(pinvalid);
pinvalid = pinvalid->pprev;
} while( pinvalid != NULL && pinvalid != pindex);
InvalidChainFound(pindexNew);
InvalidBlockFound(pindex);
}