From fc2372f75414911325716f3c70b33524b9e4a999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20H=C3=BCttel?= Date: Thu, 4 Jun 2020 21:47:31 +0200 Subject: [PATCH] Fix possible error in menu implementation --- stm-firmware/include/reflow-controller/ui/menu.h | 1 - stm-firmware/ui/menu.c | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stm-firmware/include/reflow-controller/ui/menu.h b/stm-firmware/include/reflow-controller/ui/menu.h index 95b54a8..966c799 100644 --- a/stm-firmware/include/reflow-controller/ui/menu.h +++ b/stm-firmware/include/reflow-controller/ui/menu.h @@ -24,7 +24,6 @@ #include #include #include -#include struct lcd_menu; diff --git a/stm-firmware/ui/menu.c b/stm-firmware/ui/menu.c index a9adfb3..c8be1f1 100644 --- a/stm-firmware/ui/menu.c +++ b/stm-firmware/ui/menu.c @@ -31,13 +31,15 @@ void menu_handle(struct lcd_menu *menu, uint16_t rotary_encoder_delta, enum butt menu->inputs.push_button = push_button; menu->inputs.rotary_encoder_delta = rotary_encoder_delta; + if (menu->active_entry == NULL) + menu->active_entry = menu->root_entry; + tmp = menu->active_entry; + if (menu->active_entry_type == MENU_ENTRY_FIRST_ENTER) { - if (menu->active_entry) menu->active_entry(menu, menu->active_entry_type, menu->init_parent); } else { - if (menu->active_entry) menu->active_entry(menu, menu->active_entry_type, NULL); }