From 99349173bef499779f43a19fba978d9f800a6b95 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Sun, 5 Mar 2017 12:57:39 +0100 Subject: [PATCH] TouchMenu [widget]: remove check for missing menu item --- frontend/ui/widget/touchmenu.lua | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua index 88b8a84f7..c3d5dee51 100644 --- a/frontend/ui/widget/touchmenu.lua +++ b/frontend/ui/widget/touchmenu.lua @@ -438,22 +438,19 @@ function TouchMenu:updateItems() local i = (self.page - 1) * self.perpage + c if i <= #self.item_table then local item = self.item_table[i] - -- due to the menu ordering system index can be missing - if item then - local item_tmp = TouchMenuItem:new{ - item = item, - menu = self, - dimen = Geom:new{ - w = self.item_width, - h = self.item_height, - }, - show_parent = self.show_parent, - } - table.insert(self.item_group, item_tmp) - if item.separator and c ~= self.perpage then - -- insert split line - table.insert(self.item_group, self.split_line) - end + local item_tmp = TouchMenuItem:new{ + item = item, + menu = self, + dimen = Geom:new{ + w = self.item_width, + h = self.item_height, + }, + show_parent = self.show_parent, + } + table.insert(self.item_group, item_tmp) + if item.separator and c ~= self.perpage then + -- insert split line + table.insert(self.item_group, self.split_line) end else -- item not enough to fill the whole page, break out of loop