aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-11-01 14:22:40 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-11-01 14:36:57 +0000
commit9f57f0df924175dfb3d8b222850d6363d3c17a6a (patch)
tree78494fe4681539e8144f0238cae38c3a1fe6c322
parentMerge pull request #6044 (diff)
downloadmonero-9f57f0df924175dfb3d8b222850d6363d3c17a6a.tar.xz
simplewallet: do not mention inactivity if a lock was manual
-rw-r--r--src/simplewallet/simplewallet.cpp3
1 files changed, 2 insertions, 1 deletions
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())