Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7635

Browse Source 
447bfae wallet2: fix unlocked mixup in light wallet mode (moneromooo-monero)
This commit is contained in:
luigi1111 2021-04-06 12:23:45 -05:00
commit 2098941ca0
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wallet/wallet2.cpp
View File

@ -6035,7 +6035,7 @@ uint64_t wallet2::balance(uint32_t index_major, bool strict) const
{ {
uint64_t amount = 0; uint64_t amount = 0;
if(m_light_wallet) 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)) for (const auto& i : balance_per_subaddress(index_major, strict))
amount += i.second; amount += i.second;
return amount; return amount;
@ -6049,7 +6049,7 @@ uint64_t wallet2::unlocked_balance(uint32_t index_major, bool strict, uint64_t *
if (time_to_unlock) if (time_to_unlock)
*time_to_unlock = 0; *time_to_unlock = 0;
if(m_light_wallet) 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)) for (const auto& i : unlocked_balance_per_subaddress(index_major, strict))
{ {
amount += i.second.first; amount += i.second.first;