Merge branch 'getwork_dedupe' into unique_coinbase

1 files changed, 4 insertions, 4 deletions

diff --git a/src/rpc.cpp b/src/rpc.cpp
index fdb57b3b83..9e7cfc5b3c 100644
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -1614,15 +1614,15 @@ Value getwork(const Array& params, bool fHelp)
             vNewBlock.push_back(pblock);
         }
 
-        // Update nTime
-        pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
-        pblock->nNonce = 0;
-
         // Update nExtraNonce
         static unsigned int nExtraNonce = 0;
         static int64 nPrevTime = 0;
         IncrementExtraNonce(pblock, pindexPrev, nExtraNonce, nPrevTime);
 
+        // Update nTime
+        pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
+        pblock->nNonce = 0;
+
         // Save
         mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, nExtraNonce);