From 086e5f6f86afc05373c9ee318a80be73d3f05e38 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Mon, 23 Jan 2023 10:43:08 +0100 Subject: [PATCH] Fix crash with skipScroll in MenuDisplay --- src/menudisplay.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/menudisplay.cpp b/src/menudisplay.cpp index 8b00af6..72f7f00 100644 --- a/src/menudisplay.cpp +++ b/src/menudisplay.cpp @@ -88,7 +88,7 @@ void MenuDisplay::update() item.update(); }); - if (m_selectedIndex >= 0 && getMenuItem(m_selectedIndex).skipScroll()) + if (m_selectedIndex >= 0 && m_selectedIndex < m_menuItems.size() && getMenuItem(m_selectedIndex).skipScroll()) { if (offset > 0) { @@ -104,7 +104,7 @@ void MenuDisplay::update() if (m_pressed) { m_pressed = false; - if (m_selectedIndex >= 0) + if (m_selectedIndex >= 0 && m_selectedIndex < m_menuItems.size()) getMenuItem(m_selectedIndex).triggered(); } }