aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.cpp
diff options
context:
space:
mode:
authorJaSK <[email protected]>2014-06-19 15:24:17 +0200
committerJaSK <[email protected]>2014-07-02 15:48:39 +0200
commit80dda36a07d09f99be861fa5271d0da5bd4f07dc (patch)
tree0ffa87d19657848e874dceed4c0c4df40b98f1b2 /src/wallet.cpp
parentUse script matching rather than destination matching for watch-only. (diff)
downloaddiscoin-80dda36a07d09f99be861fa5271d0da5bd4f07dc.tar.xz
discoin-80dda36a07d09f99be861fa5271d0da5bd4f07dc.zip
removed default argument values for ismine filter
Diffstat (limited to 'src/wallet.cpp')
-rw-r--r--src/wallet.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 445d98b90..e996fca3d 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -1216,7 +1216,7 @@ bool CWallet::SelectCoinsMinConf(int64_t nTargetValue, int nConfMine, int nConfT
const CWalletTx *pcoin = output.tx;
- if (output.nDepth < (pcoin->IsFromMe() ? nConfMine : nConfTheirs))
+ if (output.nDepth < (pcoin->IsFromMe(MINE_SPENDABLE|MINE_WATCH_ONLY) ? nConfMine : nConfTheirs))
continue;
int i = output.i;
@@ -1845,7 +1845,7 @@ std::map<CTxDestination, int64_t> CWallet::GetAddressBalances()
continue;
int nDepth = pcoin->GetDepthInMainChain();
- if (nDepth < (pcoin->IsFromMe() ? 0 : 1))
+ if (nDepth < (pcoin->IsFromMe(MINE_SPENDABLE|MINE_WATCH_ONLY) ? 0 : 1))
continue;
for (unsigned int i = 0; i < pcoin->vout.size(); i++)