Skip to content
Permalink
Browse files

Fix crash when pressing Enter key in formspec menu

  • Loading branch information
kahrl committed Nov 22, 2013
1 parent e52d811 commit 6f851c969251895efc3c3f02650456a2eac05d95
Showing with 8 additions and 7 deletions.
  1. +8 −7 src/guiFormSpecMenu.cpp
@@ -2297,12 +2297,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)

switch (event.KeyInput.Key) {
case KEY_RETURN:
if (m_allowclose) {
acceptInput(true);
quitMenu();
}
else
current_keys_pending.key_enter = true;
current_keys_pending.key_enter = true;
break;
case KEY_UP:
current_keys_pending.key_up = true;
@@ -2316,7 +2311,13 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
assert("reached a source line that can't ever been reached" == 0);
break;
}
acceptInput();
if (current_keys_pending.key_enter && m_allowclose) {
acceptInput(true);
quitMenu();
}
else {
acceptInput();
}
return true;
}

0 comments on commit 6f851c9

Please sign in to comment.
You can’t perform that action at this time.