diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-10 15:27:53 +0100 |
|---|---|---|
| committer | JaSK <temp@temp.temp> | 2014-07-02 15:48:38 +0200 |
| commit | 2935b211033610d7ef0deef9bf1b344a5bac029f (patch) | |
| tree | c3bb65c391305f127ac89c970eafc9de93ae9d52 | |
| parent | c8988460a2865b99ee96da6799d37ac6ccb79d4d (diff) | |
qt: Hide unspendable outputs in coin control
| -rw-r--r-- | src/qt/walletmodel.cpp | 6 | ||||
| -rw-r--r-- | src/wallet.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp index d32e74b78a..098d39e8a7 100644 --- a/src/qt/walletmodel.cpp +++ b/src/qt/walletmodel.cpp @@ -60,7 +60,8 @@ qint64 WalletModel::getBalance(const CCoinControl *coinControl) const std::vector<COutput> vCoins; wallet->AvailableCoins(vCoins, true, coinControl); BOOST_FOREACH(const COutput& out, vCoins) - nBalance += out.tx->vout[out.i].nValue; + if(out.fSpendable) + nBalance += out.tx->vout[out.i].nValue; return nBalance; } @@ -585,7 +586,8 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins) } CTxDestination address; - if(!ExtractDestination(cout.tx->vout[cout.i].scriptPubKey, address)) continue; + if(!out.fSpendable || !ExtractDestination(cout.tx->vout[cout.i].scriptPubKey, address)) + continue; mapCoins[CBitcoinAddress(address).ToString().c_str()].push_back(out); } } diff --git a/src/wallet.cpp b/src/wallet.cpp index 3d679f4c56..40ace9c40b 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1259,6 +1259,8 @@ bool CWallet::SelectCoins(int64_t nTargetValue, set<pair<const CWalletTx*,unsign { BOOST_FOREACH(const COutput& out, vCoins) { + if(!out.fSpendable) + continue; nValueRet += out.tx->vout[out.i].nValue; setCoinsRet.insert(make_pair(out.tx, out.i)); } |