aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2013-02-06 09:17:36 -0800
committerGavin Andresen <[email protected]>2013-02-06 09:17:36 -0800
commit43ba1a19b8e5a6d172742b2d13af3cceeef420f2 (patch)
treec011f3ab65c208b952d01e010b126de34d4755a1 /src/main.cpp
parentMerge branch 'reindexgen' of git://github.com/sipa/bitcoin (diff)
parentDo not call ResendWalletTransactions when reindexing, importing or on IBD (diff)
downloaddiscoin-43ba1a19b8e5a6d172742b2d13af3cceeef420f2.tar.xz
discoin-43ba1a19b8e5a6d172742b2d13af3cceeef420f2.zip
Merge pull request #2259 from Criptomonedas/dontresend
Do not call ResendWalletTransactions when reindexing or importing
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index cfb459c9a..4304840fb 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;