summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorShyRed <ShyRed@users.noreply.github.com>2018-04-14 14:36:53 +0200
committerShyRed <ShyRed@users.noreply.github.com>2018-04-14 14:36:53 +0200
commitcbcb96ae85283b8053d4b731ce7912e50b849791 (patch)
tree7cd79057d24893273f1dec47133be9a6b378c130 /scene
parenteac2863c25a4c01d99f3af3aa45e1eaa444a1f5f (diff)
ItemList selection: Check against item count
ItemList needs to check against the number of items available when the user moves the selection via "ui_right" action.
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/item_list.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index ecd98f054d..511dc248a0 100644
--- a/scene/gui/item_list.cpp
+++ b/scene/gui/item_list.cpp
@@ -678,7 +678,7 @@ void ItemList::_gui_input(const Ref<InputEvent> &p_event) {
search_string = ""; //any mousepress cancels
- if (current % current_columns != (current_columns - 1)) {
+ if (current % current_columns != (current_columns - 1) && current + 1 < items.size()) {
set_current(current + 1);
ensure_current_is_visible();
if (select_mode == SELECT_SINGLE) {