aboutsummaryrefslogtreecommitdiff
path: root/src/simplewallet
diff options
context:
space:
mode:
Diffstat (limited to 'src/simplewallet')
-rw-r--r--src/simplewallet/simplewallet.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index 4c9607737..c2cf16cae 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -3252,7 +3252,9 @@ simple_wallet::simple_wallet()
"auto-mine-for-rpc-payment-threshold <float>\n "
" Whether to automatically start mining for RPC payment if the daemon requires it.\n"
"credits-target <unsigned int>\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 <unsigned int>\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."));
@@ -6185,7 +6187,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())