Merge pull request #5535

e1016bce password: do not use line input on windows (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-05-15 16:06:58 +02:00
commit 5e80b3c3ef
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -57,7 +57,7 @@ namespace
DWORD mode_old; DWORD mode_old;
::GetConsoleMode(h_cin, &mode_old); ::GetConsoleMode(h_cin, &mode_old);
DWORD mode_new = mode_old & ~(hide_input ? ENABLE_ECHO_INPUT : 0); DWORD mode_new = mode_old & ~((hide_input ? ENABLE_ECHO_INPUT : 0) | ENABLE_LINE_INPUT);
::SetConsoleMode(h_cin, mode_new); ::SetConsoleMode(h_cin, mode_new);
bool r = true; bool r = true;
@ -76,10 +76,6 @@ namespace
break; break;
} }
else if (ucs2_ch == L'\r') else if (ucs2_ch == L'\r')
{
continue;
}
else if (ucs2_ch == L'\n')
{ {
std::cout << std::endl; std::cout << std::endl;
break; break;