Merge pull request #8004
ace4669
simplewallet: fix incoming_transfers index error (selsta)
This commit is contained in:
commit
e5710b1898
|
@ -6061,6 +6061,7 @@ bool simple_wallet::show_incoming_transfers(const std::vector<std::string>& args
|
|||
auto local_args = args;
|
||||
LOCK_IDLE_SCOPE();
|
||||
|
||||
std::set<uint32_t> subaddr_indices;
|
||||
bool filter = false;
|
||||
bool available = false;
|
||||
bool verbose = false;
|
||||
|
@ -6086,6 +6087,11 @@ bool simple_wallet::show_incoming_transfers(const std::vector<std::string>& args
|
|||
verbose = true;
|
||||
else if (local_args[0] == "uses")
|
||||
uses = true;
|
||||
else if (local_args[0].substr(0, 6) == "index=")
|
||||
{
|
||||
if (!parse_subaddress_indices(local_args[0], subaddr_indices))
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
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();
|
||||
|
||||
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)
|
||||
{
|
||||
PRINT_USAGE(USAGE_INCOMING_TRANSFERS);
|
||||
|
|
Loading…
Reference in New Issue