From ad8a5ba7aed50b48d286284e3d99037733b52bc0 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 4 May 2019 11:00:33 +0200 Subject: [PATCH] BIND popup menu fix --- radio/src/gui/128x64/model_setup.cpp | 3 ++- radio/src/main.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 4d397f4be..39bbe2baf 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1410,8 +1410,8 @@ void menuModelSetup(event_t event) removePXX2ReceiverIfEmpty(moduleIdx, receiverIdx); killEvents(event); // we stopped BIND / SHARE, we don't want to re-open the menu event = 0; + CLEAR_POPUP(); } - CLEAR_POPUP(); s_editMode = 0; } @@ -1423,6 +1423,7 @@ void menuModelSetup(event_t event) popupMenuItems[i] = reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[i]; } popupMenuTitle = STR_PXX2_SELECT_RX; + CLEAR_POPUP(); POPUP_MENU_START(onPXX2BindMenu); } else { diff --git a/radio/src/main.cpp b/radio/src/main.cpp index 3887a678d..519b2ecb9 100644 --- a/radio/src/main.cpp +++ b/radio/src/main.cpp @@ -50,7 +50,7 @@ void handleUsbConnection() } } if (!usbStarted() && usbPlugged() && getSelectedUsbMode() == USB_UNSELECTED_MODE) { - if((g_eeGeneral.USBMode == USB_UNSELECTED_MODE) && (popupMenuItemsCount == 0)) { + if (g_eeGeneral.USBMode == USB_UNSELECTED_MODE && popupMenuItemsCount == 0) { POPUP_MENU_ADD_ITEM(STR_USB_JOYSTICK); POPUP_MENU_ADD_ITEM(STR_USB_MASS_STORAGE); #if defined(DEBUG)