BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix_CNBerr_daggy' into bugfix_CNBerr 

Conflicts:
	rpc.cpp
This commit is contained in:
Luke Dashjr 2012-05-09 17:14:08 +00:00
parent f53c5ede73 b354251f1a
commit 5146599b01
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bitcoinrpc.cpp
View File

@ -1656,8 +1656,13 @@ Value getwork(const Array& params, bool fHelp)
delete pblock; delete pblock;
vNewBlock.clear(); vNewBlock.clear();
} }
// Clear pindexPrev so future getworks make a new block, despite any failures from here on
pindexPrev = NULL;
// Store the pindexBest used before CreateNewBlock, to avoid races
nTransactionsUpdatedLast = nTransactionsUpdated; nTransactionsUpdatedLast = nTransactionsUpdated;
pindexPrev = pindexBest; CBlockIndex* pindexPrevNew = pindexBest;
nStart = GetTime(); nStart = GetTime();
// Create new block // Create new block
@ -1665,6 +1670,9 @@ Value getwork(const Array& params, bool fHelp)
if (!pblock) if (!pblock)
throw JSONRPCError(-7, "Out of memory"); throw JSONRPCError(-7, "Out of memory");
vNewBlock.push_back(pblock); vNewBlock.push_back(pblock);
// Need to update only after we know CreateNewBlock succeeded
pindexPrev = pindexPrevNew;
} }
// Update nTime // Update nTime