aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-09-03 09:09:34 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-09-03 09:09:34 +0200
commit0a70a3f4d88ad8e4ab689bacff4eda0cdfa88e65 (patch)
tree57a05ca259341308e9f97404d4941d1319714585 /src/main.cpp
parent0aca8577b55d218f72c7383b2464ca07b7f77d0d (diff)
parent7464e647decace52bc075d9ac8788974504e0bb9 (diff)
downloadbitcoin-0a70a3f4d88ad8e4ab689bacff4eda0cdfa88e65.tar.xz
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 59a6984288..d1fbbb11f6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1830,7 +1830,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
// Ask the first connected node for block updates
static int nAskedForBlocks;
- if (!pfrom->fClient && (nAskedForBlocks < 1 || vNodes.size() <= 1))
+ if (!pfrom->fClient &&
+ (pfrom->nVersion < 32000 || pfrom->nVersion >= 32400) &&
+ (nAskedForBlocks < 1 || vNodes.size() <= 1))
{
nAskedForBlocks++;
pfrom->PushGetBlocks(pindexBest, uint256(0));