From a4b50a6f511e60a57955dab7586aba08a5c54337 Mon Sep 17 00:00:00 2001 From: Jethro Grassie Date: Thu, 1 Feb 2018 15:32:30 -0500 Subject: handle ^D and ^C while password prompting --- src/simplewallet/simplewallet.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/simplewallet/simplewallet.cpp') diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index a6cef1bb9..ea9212ff1 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -638,6 +638,8 @@ bool simple_wallet::change_password(const std::vector &args) // prompts for a new password, pass true to verify the password const auto pwd_container = default_password_prompter(true); + if(!pwd_container) + return true; try { @@ -6806,6 +6808,11 @@ int main(int argc, char* argv[]) else { tools::signal_handler::install([&w](int type) { + if (tools::password_container::is_prompting.load()) + { + // must be prompting for password so return and let the signal stop prompt + return; + } #ifdef WIN32 if (type == CTRL_C_EVENT) #else -- cgit v1.2.3