diff options
| -rw-r--r-- | doc/release-process.md | 2 | ||||
| -rw-r--r-- | src/qt/sendcoinsdialog.cpp | 4 | ||||
| -rw-r--r-- | src/rpcnet.cpp | 2 | ||||
| -rw-r--r-- | src/wallet.cpp | 9 |
4 files changed, 12 insertions, 5 deletions
diff --git a/doc/release-process.md b/doc/release-process.md index feadb3c1b0..3d5c577f86 100644 --- a/doc/release-process.md +++ b/doc/release-process.md @@ -17,7 +17,7 @@ Release Process ###tag version in git - git tag -a v(new version, e.g. 0.8.0) + git tag -s v(new version, e.g. 0.8.0) ###write release notes. git shortlog helps a lot, for example: diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp index 73cfa27c83..0a4e80811f 100644 --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -260,7 +260,7 @@ void SendCoinsDialog::clear() // Remove entries until only one left while(ui->entries->count()) { - delete ui->entries->takeAt(0)->widget(); + ui->entries->takeAt(0)->widget()->deleteLater(); } addEntry(); @@ -306,7 +306,7 @@ void SendCoinsDialog::updateTabsAndLabels() void SendCoinsDialog::removeEntry(SendCoinsEntry* entry) { - delete entry; + entry->deleteLater(); // If the last entry was removed add an empty one if (!ui->entries->count()) diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index 99602bd1cf..b492b57ded 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -315,7 +315,7 @@ Value getnettotals(const Array& params, bool fHelp) "\nResult:\n" "{\n" " \"totalbytesrecv\": n, (numeric) Total bytes received\n" - " \"totalbytessent\": n, (numeric) Total Bytes sent\n" + " \"totalbytessent\": n, (numeric) Total bytes sent\n" " \"timemillis\": t (numeric) Total cpu time\n" "}\n" "\nExamples:\n" diff --git a/src/wallet.cpp b/src/wallet.cpp index 14d685d6e2..241e937b1b 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -765,6 +765,10 @@ void CWalletTx::AddSupportingTransactions() { tx = *mapWalletPrev[hash]; } + else + { + continue; + } int nDepth = tx.SetMerkleBranch(); vtxPrev.push_back(tx); @@ -895,7 +899,10 @@ void CWalletTx::RelayWalletTransaction() { BOOST_FOREACH(const CMerkleTx& tx, vtxPrev) { - if (!tx.IsCoinBase()) + // Important: versions of bitcoin before 0.8.6 had a bug that inserted + // empty transactions into the vtxPrev, which will cause the node to be + // banned when retransmitted, hence the check for !tx.vin.empty() + if (!tx.IsCoinBase() && !tx.vin.empty()) if (tx.GetDepthInMainChain() == 0) RelayTransaction((CTransaction)tx, tx.GetHash()); } |