From fe942df5f8e722e795a2eb53427be9ea714197d4 Mon Sep 17 00:00:00 2001 From: philmoz Date: Fri, 20 Feb 2026 14:46:20 +1100 Subject: [PATCH] fix(color): PAGE key navigation in quick menu does not activate selected menu (#7112) --- radio/src/gui/colorlcd/setup_menus/quick_menu.cpp | 2 +- radio/src/gui/colorlcd/setup_menus/quick_menu_group.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp b/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp index 7f7276a04..13a06b025 100644 --- a/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp +++ b/radio/src/gui/colorlcd/setup_menus/quick_menu.cpp @@ -599,7 +599,7 @@ void QuickMenu::afterPG() { auto b = mainMenu->getFocusedButton(); if (b) { -#if VERSION_MAJOR > 3 +#if VERSION_MAJOR > 2 for(auto sub : subMenus) { if (sub->isSubMenu(b)) { sub->activate(); diff --git a/radio/src/gui/colorlcd/setup_menus/quick_menu_group.cpp b/radio/src/gui/colorlcd/setup_menus/quick_menu_group.cpp index 3618e3b9e..c0793b6e9 100644 --- a/radio/src/gui/colorlcd/setup_menus/quick_menu_group.cpp +++ b/radio/src/gui/colorlcd/setup_menus/quick_menu_group.cpp @@ -160,6 +160,8 @@ ButtonBase* QuickMenuGroup::addButton(EdgeTxIcon icon, const char* title, if (focusHandler) focusHandler(focus); }); + if (curBtn == nullptr) + curBtn = b; return b; }