diff options
| author | Gavin Andresen <[email protected]> | 2013-02-04 14:04:26 -0500 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-02-04 14:04:26 -0500 |
| commit | d28bd8b7ca2d0d9ad5f01e005b49acdd3a9eb917 (patch) | |
| tree | 1aa2096839505192c878fbd83377a9c778f0cbf9 /src/wallet.cpp | |
| parent | Merge pull request #2260 from Diapolo/translations (diff) | |
| download | discoin-d28bd8b7ca2d0d9ad5f01e005b49acdd3a9eb917.tar.xz discoin-d28bd8b7ca2d0d9ad5f01e005b49acdd3a9eb917.zip | |
Fix getbalance discrepency
Two changes:
Use IsConfirmed() instead of IsFinal(), so 'getbalance "*" 0' uses the same
'is this output spendable' criteria as 'getbalance'. Fixes issue #172.
And a tiny refactor to CWallet::GetBalance() (redundant call to IsFinal -- IsConfirmed
calls IsFinal).
getbalance with no arguments and 'getbalance "*" 0' could return different different results,
Diffstat (limited to 'src/wallet.cpp')
| -rw-r--r-- | src/wallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.cpp b/src/wallet.cpp index b8ef2a20b..d3345cd87 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -899,7 +899,7 @@ int64 CWallet::GetBalance() const for (map<uint256, CWalletTx>::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(); } } |