Allow enter to select items from combobox's list (#7351)

diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp
index e522769f761c8211056f1a52c340039a65605589..82210c5916aa36803a3caaef11c57b80f617d44a 100644 (file)
--- a/src/gui/guiFormSpecMenu.cpp
+++ b/src/gui/guiFormSpecMenu.cpp
@@ -2981,7 +2981,9 @@ bool GUIFormSpecMenu::preprocessEvent(const SEvent& event)
                        gui::IGUIElement *focused = Environment->getFocus();
                        if (focused && isMyChild(focused) &&
                                        (focused->getType() == gui::EGUIET_LIST_BOX ||
-                                        focused->getType() == gui::EGUIET_CHECK_BOX)) {
+                                       focused->getType() == gui::EGUIET_CHECK_BOX) &&
+                                       (focused->getParent()->getType() != gui::EGUIET_COMBO_BOX ||
+                                       event.KeyInput.Key != KEY_RETURN)) {
                                OnEvent(event);
                                return true;
                        }