aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-01-19 12:57:56 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-01-19 12:58:15 +0100
commit3b43cad9d0596a94b6d9d85460a4c591c485bf63 (patch)
tree48deedd4b244082585f5c06d269e839b764238dd /src
parent668906fcf27bdf43a82fe331a377aef55e4b593a (diff)
parent39a525c21fd1b34df63ab30868423b97b708ee49 (diff)
downloadbitcoin-3b43cad9d0596a94b6d9d85460a4c591c485bf63.tar.xz
Merge pull request #7164: Do not download transactions during initial blockchain sync
39a525c Do not download transactions during inital sync (ptschip)
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 2ba2050a15..f5bf85e7c0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4541,7 +4541,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
{
if (fBlocksOnly)
LogPrint("net", "transaction (%s) inv sent in violation of protocol peer=%d\n", inv.hash.ToString(), pfrom->id);
- else if (!fAlreadyHave && !fImporting && !fReindex)
+ else if (!fAlreadyHave && !fImporting && !fReindex && !IsInitialBlockDownload())
pfrom->AskFor(inv);
}