sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-29 13:59:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix_CNBerr_daggy' into bugfix_CNBerr

Browse Source 
Conflicts:
	rpc.cpp
This commit is contained in:
Luke Dashjr 2012-05-09 17:14:08 +00:00
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;
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;
pindexPrev = pindexBest;
CBlockIndex* pindexPrevNew = pindexBest;
nStart = GetTime();
// Create new block
@ -1665,6 +1670,9 @@ Value getwork(const Array& params, bool fHelp)
if (!pblock)
throw JSONRPCError(-7, "Out of memory");
vNewBlock.push_back(pblock);
// Need to update only after we know CreateNewBlock succeeded
pindexPrev = pindexPrevNew;
}
// Update nTime