From d89015cfe30a35f8268a88d1e09ccb79570816e7 Mon Sep 17 00:00:00 2001
From: ShyRed <ShyRed@users.noreply.github.com>
Date: Sat, 14 Apr 2018 14:36:53 +0200
Subject: [PATCH] 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.

(cherry picked from commit cbcb96ae85283b8053d4b731ce7912e50b849791)
---
 scene/gui/item_list.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp
index fe85d04003f..c6254796512 100644
--- a/scene/gui/item_list.cpp
+++ b/scene/gui/item_list.cpp
@@ -675,7 +675,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) {