diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-25 14:45:45 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-04-25 14:46:29 +0200 |
| commit | 46880ed2fd961c29b5fe4f841c747951bc706912 (patch) | |
| tree | 0cd98d12ed1f7c3c5eae078c4a0f16b5abcd76ae /src/wallet/wallet.cpp | |
| parent | c4e8390047a1ba14e32ac4f3e3ac425eb5824f21 (diff) | |
| parent | c3932b32700a210b5fbf36e32bddac604dec9288 (diff) | |
| download | bitcoin-46880ed2fd961c29b5fe4f841c747951bc706912.tar.xz | |
Merge #7688: List solvability in listunspent output and improve help
c3932b3 List solvability in listunspent output and improve help (Pieter Wuille)
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 8f2425fb6b..29d7138547 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1691,7 +1691,8 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const (!coinControl || !coinControl->HasSelected() || coinControl->fAllowOtherInputs || coinControl->IsSelected(COutPoint((*it).first, i)))) vCoins.push_back(COutput(pcoin, i, nDepth, ((mine & ISMINE_SPENDABLE) != ISMINE_NO) || - (coinControl && coinControl->fAllowWatchOnly && (mine & ISMINE_WATCH_SOLVABLE) != ISMINE_NO))); + (coinControl && coinControl->fAllowWatchOnly && (mine & ISMINE_WATCH_SOLVABLE) != ISMINE_NO), + (mine & (ISMINE_SPENDABLE | ISMINE_WATCH_SOLVABLE)) != ISMINE_NO)); } } } |