From ec9de757b8fdff3842bbec0bc9b0e6ec721d8a87 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 8 Jun 2020 14:40:53 +0200 Subject: [PATCH] Fixes #7694 --- radio/src/gui/480x272/menus.h | 9 +++++++++ radio/src/gui/480x272/radio_sdmanager.cpp | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/480x272/menus.h b/radio/src/gui/480x272/menus.h index e9f4e7008..0177397f2 100644 --- a/radio/src/gui/480x272/menus.h +++ b/radio/src/gui/480x272/menus.h @@ -570,6 +570,15 @@ inline void POPUP_WAIT(const char * s) popupFunc = runPopupWarning; } +inline void DRAW_POPUP_WAIT(const char * s) +{ + warningText = s; + warningInfoText = nullptr; + warningType = WARNING_TYPE_WAIT; + runPopupWarning(0); + warningText = nullptr; +} + inline void POPUP_INFORMATION(const char * s) { warningText = s; diff --git a/radio/src/gui/480x272/radio_sdmanager.cpp b/radio/src/gui/480x272/radio_sdmanager.cpp index 96fb7c18d..fbf12764c 100644 --- a/radio/src/gui/480x272/radio_sdmanager.cpp +++ b/radio/src/gui/480x272/radio_sdmanager.cpp @@ -568,12 +568,12 @@ bool menuRadioSdManager(event_t _event) for (auto rx = 0; rx < popupMenuItemsCount; rx++) { popupMenuItems[rx] = reusableBuffer.sdManager.otaUpdateInformation.candidateReceiversNames[rx]; } - //popupMenuTitle = STR_PXX2_SELECT_RX; + // popupMenuTitle = STR_PXX2_SELECT_RX; POPUP_MENU_START(onUpdateReceiverSelection); } } else { - POPUP_WAIT(STR_WAITING_FOR_RX); + DRAW_POPUP_WAIT(STR_WAITING_FOR_RX); } } }