From a8562fe06f00cd2c3f95b4c0818c633e0710360b Mon Sep 17 00:00:00 2001 From: Kilrah Date: Sun, 18 Aug 2019 19:23:18 +0200 Subject: [PATCH] Fix text display menu and allow viewing script contents (fix #1483) --- radio/src/gui/480x272/radio_sdmanager.cpp | 6 +++--- radio/src/gui/common/stdlcd/radio_sdmanager.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/480x272/radio_sdmanager.cpp b/radio/src/gui/480x272/radio_sdmanager.cpp index 9f1ff2060..800f15622 100644 --- a/radio/src/gui/480x272/radio_sdmanager.cpp +++ b/radio/src/gui/480x272/radio_sdmanager.cpp @@ -242,9 +242,6 @@ bool menuRadioSdManager(event_t _event) POPUP_MENU_ADD_ITEM(STR_ASSIGN_SPLASH); } } - else if (!strcasecmp(ext, TEXT_EXT)) { - POPUP_MENU_ADD_ITEM(STR_VIEW_TEXT); - } else if (!READ_ONLY() && !strcasecmp(ext, SPORT_FIRMWARE_EXT)) { if (HAS_SPORT_UPDATE_CONNECTOR()) POPUP_MENU_ADD_ITEM(STR_FLASH_EXTERNAL_DEVICE); @@ -254,6 +251,9 @@ bool menuRadioSdManager(event_t _event) else if (isExtensionMatching(ext, SCRIPTS_EXT)) { POPUP_MENU_ADD_ITEM(STR_EXECUTE_FILE); } + if (isExtensionMatching(ext, TEXT_EXT) || isExtensionMatching(ext, SCRIPTS_EXT)) { + POPUP_MENU_ADD_ITEM(STR_VIEW_TEXT); + } } if (!READ_ONLY()) { if (IS_FILE(line)) diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index 56b47b1b9..6b7fc5e3a 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -355,9 +355,6 @@ void menuRadioSdManager(event_t _event) } } #endif - else if (!strcasecmp(ext, TEXT_EXT)) { - POPUP_MENU_ADD_ITEM(STR_VIEW_TEXT); - } #if defined(LUA) else if (isExtensionMatching(ext, SCRIPTS_EXT)) { POPUP_MENU_ADD_ITEM(STR_EXECUTE_FILE); @@ -401,6 +398,9 @@ void menuRadioSdManager(event_t _event) } } #endif + if (isExtensionMatching(ext, TEXT_EXT) || isExtensionMatching(ext, SCRIPTS_EXT)) { + POPUP_MENU_ADD_ITEM(STR_VIEW_TEXT); + } } if (!READ_ONLY()) { if (IS_FILE(line))