diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-16 22:27:59 -0500 |
---|---|---|
committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-01-16 22:27:59 -0500 |
commit | 70550ed81be022c81826791a75dd1567db1d667b (patch) | |
tree | 88769f755450ae90c483066574ef572397c6f846 /src/net.h | |
parent | 5df96269d30ec57e69676e6937b45b3608df98ac (diff) | |
parent | 948072c39f913d1ebe43b3b46234f9d7a0d00427 (diff) | |
download | bitcoin-70550ed81be022c81826791a75dd1567db1d667b.tar.xz |
Merge branch '0.4.x' into 0.5.0.x
Diffstat (limited to 'src/net.h')
-rw-r--r-- | src/net.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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); |