Merge branch '0.4.x' into 0.5.0.x

1 files changed, 3 insertions, 1 deletions

diff --git a/src/net.h b/src/net.h
index 03da382df3..8a74b253f3 100644
--- a/src/net.h
+++ b/src/net.h
@@ -271,7 +271,9 @@ public:
         // Make sure not to reuse time indexes to keep things in the same order
         int64 nNow = (GetTime() - 1) * 1000000;
         static int64 nLastTime;
-        nLastTime = nNow = std::max(nNow, ++nLastTime);
+        ++nLastTime;
+        nNow = std::max(nNow, nLastTime);
+        nLastTime = nNow;
 
         // Each retry is 2 minutes after the last
         nRequestTime = std::max(nRequestTime + 2 * 60 * 1000000, nNow);