diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-03 15:09:16 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-03-03 15:09:50 +0100 |
| commit | 3368895c3b94d8fda4d6cca22ae4766625b7a2c9 (patch) | |
| tree | d634e68b1091aeea5c2437f83a2db9a9d02fad49 /src/wallet | |
| parent | 7f001bdf641d73c77a70b4218736c8b5b9c99a5d (diff) | |
| parent | 5a2b1c0c8b49c5ae79946e71b9f989b33c9fcf5c (diff) | |
| download | bitcoin-3368895c3b94d8fda4d6cca22ae4766625b7a2c9.tar.xz | |
Merge #7521: Don't resend wallet txs that aren't in our own mempool
5a2b1c0 Don't resend wallet txs that aren't in our own mempool (Alex Morcos)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 16653b9fd9..8ea957ee33 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1263,7 +1263,7 @@ bool CWalletTx::RelayWalletTransaction() assert(pwallet->GetBroadcastTransactions()); if (!IsCoinBase()) { - if (GetDepthInMainChain() == 0 && !isAbandoned()) { + if (GetDepthInMainChain() == 0 && !isAbandoned() && InMempool()) { LogPrintf("Relaying wtx %s\n", GetHash().ToString()); RelayTransaction((CTransaction)*this); return true; |