diff options
| author | Cozz Lovan <cozzlovan@yahoo.com> | 2014-07-26 21:05:11 +0200 |
|---|---|---|
| committer | Cozz Lovan <cozzlovan@yahoo.com> | 2014-10-03 04:29:51 +0200 |
| commit | ccca27a788fe1ae13661308243c20a1d7a3d0074 (patch) | |
| tree | b862f0f1e0fe98fdd1957cc2236076fef899cc50 /src/qt | |
| parent | 29f96e8bc652cb14c6fdefe5279ee983054faa2a (diff) | |
| download | bitcoin-ccca27a788fe1ae13661308243c20a1d7a3d0074.tar.xz | |
[Wallet] Watch-only fixes
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/transactionrecord.cpp | 2 | ||||
| -rw-r--r-- | src/qt/walletmodel.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp index afb343f349..5278c8673a 100644 --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -32,7 +32,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet * { QList<TransactionRecord> parts; int64_t nTime = wtx.GetTxTime(); - CAmount nCredit = wtx.GetCredit(true); + CAmount nCredit = wtx.GetCredit(ISMINE_ALL); CAmount nDebit = wtx.GetDebit(ISMINE_ALL); CAmount nNet = nCredit - nDebit; uint256 hash = wtx.GetHash(); diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index b8701a23a6..b4733d369e 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -605,7 +605,8 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins) int nDepth = wallet->mapWallet[outpoint.hash].GetDepthInMainChain(); if (nDepth < 0) continue; COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth, true); - vCoins.push_back(out); + if (outpoint.n < out.tx->vout.size() && wallet->IsMine(out.tx->vout[outpoint.n]) == ISMINE_SPENDABLE) + vCoins.push_back(out); } BOOST_FOREACH(const COutput& out, vCoins) |