rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-22 23:42:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6076

Browse source 
22d30866 simplewallet: add missing inactivity-lock-timeout to set help blurb (moneromooo-monero)
9f57f0df simplewallet: do not mention inactivity if a lock was manual (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-02-06 00:29:52 -08:00
commit cd1610bc37
No known key found for this signature in database
GPG key ID: C64552D877C32479
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/simplewallet/simplewallet.cpp
View file

@ -3252,7 +3252,9 @@ simple_wallet::simple_wallet()
"auto-mine-for-rpc-payment-threshold <float>\n " "auto-mine-for-rpc-payment-threshold <float>\n "
" Whether to automatically start mining for RPC payment if the daemon requires it.\n" " Whether to automatically start mining for RPC payment if the daemon requires it.\n"
"credits-target <unsigned int>\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", m_cmd_binder.set_handler("encrypted_seed",
boost::bind(&simple_wallet::on_command, this, &simple_wallet::encrypted_seed, _1), boost::bind(&simple_wallet::on_command, this, &simple_wallet::encrypted_seed, _1),
tr("Display the encrypted Electrum-style mnemonic seed.")); tr("Display the encrypted Electrum-style mnemonic seed."));
@ -6185,7 +6187,8 @@ void simple_wallet::check_for_inactivity_lock(bool user)
} }
while (1) 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 try
{ {
if (get_and_verify_password()) if (get_and_verify_password())