highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-11 09:42:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.6.0.x' into 0.6.x

Browse Source
This commit is contained in:
Luke Dashjr
2012-08-12 17:22:59 +00:00
parent 23cdae18f0 3171daef6c
commit 92dfcea0e9
35 changed files with 94 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet.cpp
View File

@@ -750,7 +750,7 @@ void CWallet::ReacceptWalletTransactions()
}
else
{
// Reaccept any txes of ours that aren't already in a block
// Re-accept any txes of ours that aren't already in a block
if (!wtx.IsCoinBase())
wtx.AcceptWalletTransaction(txdb, false);
}
@@ -759,7 +759,7 @@ void CWallet::ReacceptWalletTransactions()
{
// TODO: optimize this to scan just part of the block chain?
if (ScanForWalletTransactions(pindexGenesisBlock))
fRepeat = true; // Found missing transactions: re-do Reaccept.
fRepeat = true; // Found missing transactions: re-do re-accept.
}
}
}