diff options
| author | Gavin Andresen <[email protected]> | 2013-04-08 06:37:58 -0700 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-04-08 06:37:58 -0700 |
| commit | 1829134afec6058d2d7d713b5b280a2d4605bb2e (patch) | |
| tree | 548ec9bfed891b2033b0b0acddb0463b48cab80f /src/rpcwallet.cpp | |
| parent | Merge pull request #2403 from gmaxwell/minfee-to-relayfee (diff) | |
| parent | Fix getbalance discrepency (diff) | |
| download | discoin-1829134afec6058d2d7d713b5b280a2d4605bb2e.tar.xz discoin-1829134afec6058d2d7d713b5b280a2d4605bb2e.zip | |
Merge pull request #2272 from gavinandresen/getbalancefix
Fix getbalance discrepency
Diffstat (limited to 'src/rpcwallet.cpp')
| -rw-r--r-- | src/rpcwallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 526a7b5b3..9a899f923 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<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it) { const CWalletTx& wtx = (*it).second; - if (!wtx.IsFinal()) + if (!wtx.IsConfirmed()) continue; int64 allFee; |