portapack-mayhem/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2026-09-11 09:09:29 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

ui_menu: guard select against empty menu

Browse Source
This commit is contained in:
gullradriel
2026-08-08 21:33:56 +02:00
parent 8f1c9ca144
commit d69adb517e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/application/ui/ui_menu.cpp
+4 -2
View File
@@ -344,7 +344,9 @@ bool MenuView::on_key(const KeyEvent key) {
} }
[[fallthrough]]; [[fallthrough]];
case KeyEvent::Select: case KeyEvent::Select:
if (menu_items[highlighted_item].on_select) { // NB: a MenuView can legitimately be empty (e.g. after clear()) while
// still holding focus; indexing menu_items unchecked faults there.
if (highlighted_item < menu_items.size() && menu_items[highlighted_item].on_select) {
menu_items[highlighted_item].on_select(key); menu_items[highlighted_item].on_select(key);
} }
return true; return true;
@@ -364,7 +366,7 @@ bool MenuView::on_keyboard(const KeyboardEvent key) {
if (key == '-') return set_highlighted(highlighted_item - 1); if (key == '-') return set_highlighted(highlighted_item - 1);
if (key == '+') return set_highlighted(highlighted_item + 1); if (key == '+') return set_highlighted(highlighted_item + 1);
if (key == 10) { if (key == 10) {
if (menu_items[highlighted_item].on_select) { if (highlighted_item < menu_items.size() && menu_items[highlighted_item].on_select) {
menu_items[highlighted_item].on_select(KeyEvent::Right); menu_items[highlighted_item].on_select(KeyEvent::Right);
} }
return true; return true;