diff options
| author | Alex Morcos <morcos@chaincode.com> | 2016-02-11 17:10:41 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-04-27 22:34:48 +0200 |
| commit | 21b2f82eb743757f2971ce2e1fc97e8a6171e5c7 (patch) | |
| tree | 225902bb540419fbe066e5db752a137c336a360f /src | |
| parent | 66d54085598205de2182c04739cc418e2d15543c (diff) | |
| download | bitcoin-21b2f82eb743757f2971ce2e1fc97e8a6171e5c7.tar.xz | |
Don't resend wallet txs that aren't in our own mempool
Github-Pull: #7521
Rebased-From: 5a2b1c0c8b49c5ae79946e71b9f989b33c9fcf5c
Diffstat (limited to 'src')
| -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 71f3091489..177edbf2db 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1264,7 +1264,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; |