From 30bf6f753084125ba813964523c24961785a3a7f Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 20 Jan 2016 15:15:51 +0100 Subject: [PATCH] [Horus] Segfault in popups displaying file lists --- radio/src/gui/horus/menus.h | 2 +- radio/src/sdcard.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/horus/menus.h b/radio/src/gui/horus/menus.h index 88e9a250f..523cc8988 100644 --- a/radio/src/gui/horus/menus.h +++ b/radio/src/gui/horus/menus.h @@ -382,7 +382,7 @@ extern uint8_t warningInfoFlags; #define NAVIGATION_MENUS #define POPUP_MENU_ADD_ITEM(s) do { popupMenuOffsetType = MENU_OFFSET_INTERNAL; if (popupMenuNoItems < POPUP_MENU_MAX_LINES) popupMenuItems[popupMenuNoItems++] = s; } while (0) #define POPUP_MENU_MAX_LINES 12 -#define MENU_MAX_DISPLAY_LINES 6 +#define MENU_MAX_DISPLAY_LINES 9 #define MENU_LINE_LENGTH (LEN_MODEL_NAME+12) #define POPUP_MENU_ITEMS_FROM_BSS() extern const char * popupMenuItems[POPUP_MENU_MAX_LINES]; diff --git a/radio/src/sdcard.cpp b/radio/src/sdcard.cpp index 6a0351c01..ad5911771 100644 --- a/radio/src/sdcard.cpp +++ b/radio/src/sdcard.cpp @@ -114,7 +114,7 @@ bool sdListFiles(const char * path, const char * extension, const uint8_t maxlen fno.lfsize = sizeof(lfn); #endif -#if defined(PCBTARANIS) +#if defined(PCBTARANIS) || defined(PCBHORUS) popupMenuOffsetType = MENU_OFFSET_EXTERNAL; #endif static uint16_t lastpopupMenuOffset = 0;