-- version 0.3.14 release

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@171 1a98c847-1fd6-4fd8-948a-caf3550aa51b
This commit is contained in:
s_nakamoto
2010-10-21 16:47:16 +00:00
parent d9c6b09ac4
commit 2ce73dbe85
3 changed files with 5 additions and 5 deletions

View File

@@ -2987,7 +2987,7 @@ void BitcoinMiner()
txNew.vin.resize(1);
txNew.vin[0].prevout.SetNull();
int64 nNow = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
if (nNow > nPrevTime+1 && ++nExtraNonce >= 0x7f)
if (++nExtraNonce >= 0x7f && nNow > nPrevTime+1)
{
nExtraNonce = 1;
nPrevTime = nNow;