diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 526a7b5b..9a899f92 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -520,12 +520,12 @@ Value getbalance(const Array& params, bool fHelp) if (params[0].get_str() == "*") { // Calculate total balance a different way from GetBalance() // (GetBalance() sums up all unspent TxOuts) - // getbalance and getbalance '*' should always return the same number. + // getbalance and getbalance '*' 0 should return the same number int64 nBalance = 0; for (map::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it) { const CWalletTx& wtx = (*it).second; - if (!wtx.IsFinal()) + if (!wtx.IsConfirmed()) continue; int64 allFee; diff --git a/src/wallet.cpp b/src/wallet.cpp index 5761b008..2cc2e60f 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -910,7 +910,7 @@ int64 CWallet::GetBalance() const for (map::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it) { const CWalletTx* pcoin = &(*it).second; - if (pcoin->IsFinal() && pcoin->IsConfirmed()) + if (pcoin->IsConfirmed()) nTotal += pcoin->GetAvailableCredit(); } }