From 3de8ab047794109136e8af4d56c1e7f2a82fe2f4 Mon Sep 17 00:00:00 2001 From: Jason P Date: Sun, 17 Aug 2025 07:14:24 -0500 Subject: [PATCH] Finalize merge conflict fix --- src/graphics/draw/MenuHandler.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/graphics/draw/MenuHandler.cpp b/src/graphics/draw/MenuHandler.cpp index 098aa3601..886c711fd 100644 --- a/src/graphics/draw/MenuHandler.cpp +++ b/src/graphics/draw/MenuHandler.cpp @@ -26,7 +26,6 @@ menuHandler::screenMenus menuHandler::menuQueue = menu_none; bool test_enabled = false; uint8_t test_count = 0; - void menuHandler::loraMenu() { static const char *optionsArray[] = {"Back", "Region Picker"}; @@ -41,6 +40,9 @@ void menuHandler::loraMenu() } else if (selected == lora_picker) { menuHandler::menuQueue = menuHandler::lora_picker; } + }; + screen->showOverlayBanner(bannerOptions); +} void menuHandler::OnboardMessage() { @@ -59,7 +61,6 @@ void menuHandler::OnboardMessage() bannerOptions.bannerCallback = [](int selected) -> void { menuHandler::menuQueue = menuHandler::no_timeout_lora_picker; screen->runNow(); - }; screen->showOverlayBanner(bannerOptions); }