diff options
| author | selsta <selsta@sent.at> | 2021-10-10 23:14:04 +0200 |
|---|---|---|
| committer | selsta <selsta@sent.at> | 2021-10-10 23:17:16 +0200 |
| commit | ace46695435904e69b64cb265dfa985ac231d352 (patch) | |
| tree | bdfeb7f9e58593908a728b8776dd5595ec15f5e5 | |
| parent | Merge pull request #7984 (diff) | |
| download | monero-ace46695435904e69b64cb265dfa985ac231d352.tar.xz | |
simplewallet: fix incoming_transfers index error
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index dc031b36c..fd784c5ae 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -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); |