From 6db0c0791a9fd5080d9c20ffb09fba820b1b7a3f Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 11 Jun 2016 13:53:53 +0200 Subject: [PATCH] [Horus] Current model overwritten in MODEL SELECT when selecting a new model --- radio/src/gui/horus/menu_model_select.cpp | 5 ++++- radio/src/storage/sdcard_raw.cpp | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/horus/menu_model_select.cpp b/radio/src/gui/horus/menu_model_select.cpp index fab35040d..2dd50fc6b 100644 --- a/radio/src/gui/horus/menu_model_select.cpp +++ b/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) { diff --git a/radio/src/storage/sdcard_raw.cpp b/radio/src/storage/sdcard_raw.cpp index 98949b8a3..3941b96cf 100644 --- a/radio/src/storage/sdcard_raw.cpp +++ b/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; }