aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-07-14 13:05:20 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-07-14 13:16:11 +0200
commitd5a6b785e3673f89bae6424fbf43ba9c3c3073b4 (patch)
tree9fa5a569d52c5e49f47e4e50f8fef4cf5e2819ff
parent6513a9f7033737458735305a08606280d6d0d33c (diff)
parentd512534cd71ebdb67bf0cb2a377dc7c2b06ba438 (diff)
downloadbitcoin-d5a6b785e3673f89bae6424fbf43ba9c3c3073b4.tar.xz
Merge pull request #4525
d512534 Fixed error in 'getbalance' when using watchonly addresses. (JaSK)
-rw-r--r--src/wallet.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 8d27da9d40..a754c1cd5f 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -845,7 +845,7 @@ void CWalletTx::GetAmounts(list<pair<CTxDestination, int64_t> >& listReceived,
listSent.push_back(make_pair(address, txout.nValue));
// 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));
}