diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-12-25 21:17:32 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-12-25 21:17:32 +0200 |
| commit | 170f598ac9e7596c557cb47da169c3a856f13038 (patch) | |
| tree | 70b2d1b228d01790d6a206040e7642785df42a66 /src/simplewallet/simplewallet.cpp | |
| parent | Merge pull request #2916 (diff) | |
| parent | simplewallet: fix default unspent_outputs output with subaddresses (diff) | |
| download | monero-170f598ac9e7596c557cb47da169c3a856f13038.tar.xz | |
Merge pull request #2918
f5bc7f18 simplewallet: fix default unspent_outputs output with subaddresses (moneromooo-monero)
Diffstat (limited to 'src/simplewallet/simplewallet.cpp')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 64e665fb3..964278e7c 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -5350,7 +5350,7 @@ bool simple_wallet::unspent_outputs(const std::vector<std::string> &args_) for (const auto& td : transfers) { uint64_t amount = td.amount(); - if (td.m_spent || amount < min_amount || amount > max_amount || td.m_subaddr_index.major != m_current_subaddress_account || subaddr_indices.count(td.m_subaddr_index.minor) == 0) + if (td.m_spent || amount < min_amount || amount > max_amount || td.m_subaddr_index.major != m_current_subaddress_account || (subaddr_indices.count(td.m_subaddr_index.minor) == 0 && !subaddr_indices.empty())) continue; amount_to_tds[amount].push_back(td); if (min_height > td.m_block_height) min_height = td.m_block_height; |