From d53ca50b16bf3221b305aa343269b5c08f6612ba Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 20 Nov 2014 14:36:14 +0300 Subject: [PATCH] gui/widget/keyboard_input.cpp: fix cycle on dialog after timeout Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/3958428dd769b94c2573a2111dd076eb1f6fbf60 Author: [CST] Focus Date: 2014-11-20 (Thu, 20 Nov 2014) --- src/gui/widget/keyboard_input.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp index 640a4615e..af2280334 100644 --- a/src/gui/widget/keyboard_input.cpp +++ b/src/gui/widget/keyboard_input.cpp @@ -565,8 +565,10 @@ int CKeyboardInput::exec(CMenuTarget* parent, const std::string &) else if ((msg == CRCInput::RC_home) || (msg == CRCInput::RC_timeout)) { if ((inputString->getValue() != oldval) && - (ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel) == CMessageBox::mbrCancel)) + (ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbCancel) == CMessageBox::mbrCancel)) { + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]); continue; + } *inputString = oldval; loop = false;