Update nTime after nExtraNonce to avoid potential race

(extraNonce being reset due to just-occurred time change after nTime is set)

1 files changed, 4 insertions, 4 deletions

diff --git a/rpc.cpp b/rpc.cpp
index 90e7f15a9..2175dddb4 100644
--- a/rpc.cpp
+++ b/rpc.cpp
@@ -1330,15 +1330,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);