[Horus] Current model overwritten in MODEL SELECT when selecting a new model

radio/src/gui/horus/menu_model_select.cpp

@@ -114,9 +114,12 @@ void onCategorySelectMenu(const char * result)
 void onModelSelectMenu(const char * result)
 {
   if (result == STR_SELECT_MODEL) {
+    // we store the latest changes if any
+    storageCheck(true);
+    memcpy(g_eeGeneral.currModelFilename, currentModel->name, LEN_MODEL_FILENAME);
+    loadModel(g_eeGeneral.currModelFilename);
     storageDirty(EE_GENERAL);
     storageCheck(true);
-    loadModel(g_eeGeneral.currModelFilename);
     chainMenu(menuMainView);
   }
   else if (result == STR_DELETE_MODEL) {

radio/src/storage/sdcard_raw.cpp

@@ -130,8 +130,6 @@ const char * loadModel(const char * filename)
 
   postModelLoad(newModel);
 
-  memcpy(g_eeGeneral.currModelFilename, filename, LEN_MODEL_FILENAME);
-
   return error;
 }