From 9ccb7e672fb4fc8076a7518333de9a89353f9e5a Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Tue, 24 Mar 2015 19:41:33 +0100
Subject: [PATCH] Should fix the problem with the bootloader flash (file
 extension search was wrong)

---
 radio/src/gui/Taranis/menu_general_sdmanager.cpp | 2 +-
 radio/src/strhelpers.cpp                         | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/radio/src/gui/Taranis/menu_general_sdmanager.cpp b/radio/src/gui/Taranis/menu_general_sdmanager.cpp
index a88693040..e8df0842c 100755
--- a/radio/src/gui/Taranis/menu_general_sdmanager.cpp
+++ b/radio/src/gui/Taranis/menu_general_sdmanager.cpp
@@ -321,8 +321,8 @@ void menuGeneralSdManager(uint8_t _event)
             }
           }
           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_INTERNAL_MODULE);
           }
         }
         if (!READ_ONLY()) {
diff --git a/radio/src/strhelpers.cpp b/radio/src/strhelpers.cpp
index 2733a59f2..7074450d8 100644
--- a/radio/src/strhelpers.cpp
+++ b/radio/src/strhelpers.cpp
@@ -207,8 +207,9 @@ char *strAppendFilename(char *dest, const char *filename, const int size)
 #define LEN_FILE_EXTENSION 4
 char *getFileExtension(char *filename, int size)
 {
-  for (int i=0; i<size-LEN_FILE_EXTENSION; ++i) {
-    if (filename[i] == '.' || filename[i] == '\0') {
+  int len = min<int>(size, strlen(filename));
+  for (int i=len; i>=len-LEN_FILE_EXTENSION; --i) {
+    if (filename[i] == '.') {
       return &filename[i];
     }
   }