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 #8004

Browse Source 
ace4669 simplewallet: fix incoming_transfers index error (selsta)
This commit is contained in:
luigi1111 2021-10-25 18:59:54 -05:00
commit e5710b1898
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/simplewallet/simplewallet.cpp
View File

@ -6061,6 +6061,7 @@ bool simple_wallet::show_incoming_transfers(const std::vector<std::string>& args
auto local_args = args; auto local_args = args;
LOCK_IDLE_SCOPE(); LOCK_IDLE_SCOPE();
std::set<uint32_t> subaddr_indices;
bool filter = false; bool filter = false;
bool available = false; bool available = false;
bool verbose = false; bool verbose = false;
@ -6086,6 +6087,11 @@ bool simple_wallet::show_incoming_transfers(const std::vector<std::string>& args
verbose = true; verbose = true;
else if (local_args[0] == "uses") else if (local_args[0] == "uses")
uses = true; uses = true;
else if (local_args[0].substr(0, 6) == "index=")
{
if (!parse_subaddress_indices(local_args[0], subaddr_indices))
return true;
}
else else
{ {
fail_msg_writer() << tr("Invalid keyword: ") << local_args.front(); fail_msg_writer() << tr("Invalid keyword: ") << local_args.front();
@ -6098,14 +6104,6 @@ bool simple_wallet::show_incoming_transfers(const std::vector<std::string>& args
PAUSE_READLINE(); PAUSE_READLINE();
std::set<uint32_t> subaddr_indices;
if (local_args.size() > 0 && local_args[0].substr(0, 6) == "index=")
{
if (!parse_subaddress_indices(local_args[0], subaddr_indices))
return true;
local_args.erase(local_args.begin());
}
if (local_args.size() > 0) if (local_args.size() > 0)
{ {
PRINT_USAGE(USAGE_INCOMING_TRANSFERS); PRINT_USAGE(USAGE_INCOMING_TRANSFERS);