aboutsummaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-10-21 16:47:16 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-10-21 16:47:16 +0000
commit2ce73dbe8546b0bfb5e512a6b11e201871374147 (patch)
tree6dc568714503d7dc84f97916cc6361aa1c00b29f /main.cpp
parentd9c6b09ac42d21abd151a0feaff676b8a8a24bb9 (diff)
downloadbitcoin-2ce73dbe8546b0bfb5e512a6b11e201871374147.tar.xz
-- version 0.3.14 releasev0.3.14
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@171 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/main.cpp b/main.cpp
index 2d950eefb5..764ddaac02 100644
--- a/main.cpp
+++ b/main.cpp
@@ -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;