From 9f57f0df924175dfb3d8b222850d6363d3c17a6a Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Fri, 1 Nov 2019 14:22:40 +0000 Subject: [PATCH 1/2] simplewallet: do not mention inactivity if a lock was manual --- src/simplewallet/simplewallet.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 03693a57c..100344601 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -6195,7 +6195,8 @@ void simple_wallet::check_for_inactivity_lock(bool user) } while (1) { - tools::msg_writer() << tr("Locked due to inactivity. The wallet password is required to unlock the console."); + const char *inactivity_msg = user ? "" : tr("Locked due to inactivity."); + tools::msg_writer() << inactivity_msg << (inactivity_msg[0] ? " " : "") << tr("The wallet password is required to unlock the console."); try { if (get_and_verify_password()) From 22d30866ca9eb312e8463f8386e8f129c096a14b Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Fri, 1 Nov 2019 15:37:55 +0000 Subject: [PATCH 2/2] simplewallet: add missing inactivity-lock-timeout to set help blurb --- src/simplewallet/simplewallet.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 100344601..5e7159645 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -3262,7 +3262,9 @@ simple_wallet::simple_wallet() "auto-mine-for-rpc-payment-threshold \n " " Whether to automatically start mining for RPC payment if the daemon requires it.\n" "credits-target \n" - " The RPC payment credits balance to target (0 for default).")); + " The RPC payment credits balance to target (0 for default).\n " + "inactivity-lock-timeout \n " + " How many seconds to wait before locking the wallet (0 to disable).")); m_cmd_binder.set_handler("encrypted_seed", boost::bind(&simple_wallet::on_command, this, &simple_wallet::encrypted_seed, _1), tr("Display the encrypted Electrum-style mnemonic seed."));