aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2021-04-06 12:23:45 -0500
committerluigi1111 <luigi1111w@gmail.com>2021-04-06 12:23:45 -0500
commit2098941ca03b7aa1f92bfa802d2600c075d4bd70 (patch)
tree9c2aab2426e652e668d6c784ab1285776e0501c6
parentMerge pull request #7580 (diff)
parentwallet2: fix unlocked mixup in light wallet mode (diff)
downloadmonero-2098941ca03b7aa1f92bfa802d2600c075d4bd70.tar.xz
Merge pull request #7635
447bfae wallet2: fix unlocked mixup in light wallet mode (moneromooo-monero)
-rw-r--r--src/wallet/wallet2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 206bafade..0af896c76 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -6035,7 +6035,7 @@ uint64_t wallet2::balance(uint32_t index_major, bool strict) const
{
uint64_t amount = 0;
if(m_light_wallet)
- return m_light_wallet_unlocked_balance;
+ return m_light_wallet_balance;
for (const auto& i : balance_per_subaddress(index_major, strict))
amount += i.second;
return amount;
@@ -6049,7 +6049,7 @@ uint64_t wallet2::unlocked_balance(uint32_t index_major, bool strict, uint64_t *
if (time_to_unlock)
*time_to_unlock = 0;
if(m_light_wallet)
- return m_light_wallet_balance;
+ return m_light_wallet_unlocked_balance;
for (const auto& i : unlocked_balance_per_subaddress(index_major, strict))
{
amount += i.second.first;