gsmanners
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when pressing Enter key in formspec menu

master
Kahrl 2013-11-23 00:30:16 +01:00
parent e52d811110
commit 6f851c9692
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/guiFormSpecMenu.cpp
View File

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