Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-17 13:25:20 +03:00
Code Issues Wiki Activity

Should fix the problem with the bootloader flash (file extension search

Browse source 
was wrong)
This commit is contained in:
bsongis 2015-03-24 19:41:33 +01:00
parent 360356b7e4
commit 9ccb7e672f
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/Taranis/menu_general_sdmanager.cpp
View file

@ -321,8 +321,8 @@ void menuGeneralSdManager(uint8_t _event)
} }
} }
else if (!READ_ONLY() && !strcasecmp(ext, SPORT_FIRMWARE_EXT)) { else if (!READ_ONLY() && !strcasecmp(ext, SPORT_FIRMWARE_EXT)) {
MENU_ADD_ITEM(STR_FLASH_INTERNAL_MODULE);
MENU_ADD_ITEM(STR_FLASH_EXTERNAL_DEVICE); MENU_ADD_ITEM(STR_FLASH_EXTERNAL_DEVICE);
MENU_ADD_ITEM(STR_FLASH_INTERNAL_MODULE);
} }
} }
if (!READ_ONLY()) { if (!READ_ONLY()) {

5
radio/src/strhelpers.cpp
View file

@ -207,8 +207,9 @@ char *strAppendFilename(char *dest, const char *filename, const int size)
#define LEN_FILE_EXTENSION 4 #define LEN_FILE_EXTENSION 4
char *getFileExtension(char *filename, int size) char *getFileExtension(char *filename, int size)
{ {
for (int i=0; i<size-LEN_FILE_EXTENSION; ++i) { int len = min<int>(size, strlen(filename));
if (filename[i] == '.' || filename[i] == '\0') { for (int i=len; i>=len-LEN_FILE_EXTENSION; --i) {
if (filename[i] == '.') {
return &filename[i]; return &filename[i];
} }
} }