Merge pull request #4525

d512534 Fixed error in 'getbalance' when using watchonly addresses. (JaSK)
This commit is contained in:
Wladimir J. van der Laan 2014-07-14 13:05:20 +02:00
commit d5a6b785e3
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -845,7 +845,7 @@ void CWalletTx::GetAmounts(list<pair<CTxDestination, int64_t> >& listReceived,
listSent.push_back(make_pair(address, txout.nValue)); listSent.push_back(make_pair(address, txout.nValue));
// If we are receiving the output, add it as a "received" entry // If we are receiving the output, add it as a "received" entry
if (fIsMine) if (fIsMine & filter)
listReceived.push_back(make_pair(address, txout.nValue)); listReceived.push_back(make_pair(address, txout.nValue));
} }