aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2013-02-06 09:17:36 -0800
committerGavin Andresen <gavinandresen@gmail.com>2013-02-06 09:17:36 -0800
commit43ba1a19b8e5a6d172742b2d13af3cceeef420f2 (patch)
treec011f3ab65c208b952d01e010b126de34d4755a1
parent79892883d714dd34906a0f641400d6b237ebd75c (diff)
parente90b831e83298907d2f9eca77bbda0a687bf13d7 (diff)
downloadbitcoin-43ba1a19b8e5a6d172742b2d13af3cceeef420f2.tar.xz
Merge pull request #2259 from Criptomonedas/dontresend
Do not call ResendWalletTransactions when reindexing or importing
-rw-r--r--src/main.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index cfb459c9a7..4304840fb7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3812,7 +3812,12 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
}
// Resend wallet transactions that haven't gotten in a block yet
- ResendWalletTransactions();
+ // Except during reindex, importing and IBD, when old wallet
+ // transactions become unconfirmed and spams other nodes.
+ if (!fReindex && !fImporting && !IsInitialBlockDownload())
+ {
+ ResendWalletTransactions();
+ }
// Address refresh broadcast
static int64 nLastRebroadcast;