Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 20:35:33 +03:00
Code Issues Wiki Activity

Fixed exiting from CMS menu. (#9221)

Browse source 
Fixed exiting from CMS menu.
This commit is contained in:
Michael Keller 2019-11-26 06:19:14 +13:00 • committed by GitHub
commit 23c458e85f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/cms/cms.c
View file

@ -541,8 +541,9 @@ STATIC_UNIT_TESTED long cmsMenuBack(displayPort_t *pDisplay); // Forward; will b
static void cmsDrawMenu(displayPort_t *pDisplay, uint32_t currentTimeUs) static void cmsDrawMenu(displayPort_t *pDisplay, uint32_t currentTimeUs)
{ {
if (!pageTop) if (!pageTop || !cmsInMenu) {
return; return;
}
uint8_t i; uint8_t i;
const OSD_Entry *p; const OSD_Entry *p;

2
src/main/cms/cms_menu_main.c
View file

@ -115,7 +115,7 @@ static const OSD_Entry menuMainEntries[] =
{"FC&FIRMWARE", OME_Submenu, cmsMenuChange, &cmsx_menuFirmware, 0}, {"FC&FIRMWARE", OME_Submenu, cmsMenuChange, &cmsx_menuFirmware, 0},
{"MISC", OME_Submenu, cmsMenuChange, &cmsx_menuMisc, 0}, {"MISC", OME_Submenu, cmsMenuChange, &cmsx_menuMisc, 0},
{"SAVE/EXIT", OME_Funcall, cmsx_SaveExitMenu, NULL, 0}, {"SAVE/EXIT", OME_Funcall, cmsx_SaveExitMenu, NULL, 0},
{NULL,OME_END, NULL, NULL, 0}, {NULL, OME_END, NULL, NULL, 0},
}; };
CMS_Menu cmsx_menuMain = { CMS_Menu cmsx_menuMain = {