diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-15 21:05:54 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-15 21:05:54 -0400 |
| commit | 79fc752b6104b796aa5e0a8a8b6d2822fb0f3299 (patch) | |
| tree | 7ae039ced8787d0fe10e1150f3dcf249524c6a4c /src/wallet.cpp | |
| parent | fdcafa35359b3ad9af79d2367a1884d01607fb84 (diff) | |
| parent | 8460185dec74383b1e49500683cfc7aa9ceba554 (diff) | |
| download | bitcoin-79fc752b6104b796aa5e0a8a8b6d2822fb0f3299.tar.xz | |
Merge branch '0.4.x' into 0.5.0.x
Conflicts:
src/keystore.h
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index 20c3eabdc7..43c9656f78 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -547,8 +547,10 @@ void CWalletTx::AddSupportingTransactions(CTxDB& txdb) vtxPrev.push_back(tx); if (nDepth < COPY_DEPTH) + { BOOST_FOREACH(const CTxIn& txin, tx.vin) vWorkQueue.push_back(txin.prevout.hash); + } } } } |