Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 00:35:18 +03:00
Code Issues Wiki Activity

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

Browse source
This commit is contained in:
Bertrand Songis 2016-06-11 13:53:53 +02:00
parent 1db3e1f816
commit 6db0c0791a
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
radio/src/gui/horus/menu_model_select.cpp
View file

@ -114,9 +114,12 @@ void onCategorySelectMenu(const char * result)
void onModelSelectMenu(const char * result) void onModelSelectMenu(const char * result)
{ {
if (result == STR_SELECT_MODEL) { 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); storageDirty(EE_GENERAL);
storageCheck(true); storageCheck(true);
loadModel(g_eeGeneral.currModelFilename);
chainMenu(menuMainView); chainMenu(menuMainView);
} }
else if (result == STR_DELETE_MODEL) { else if (result == STR_DELETE_MODEL) {

2
radio/src/storage/sdcard_raw.cpp
View file

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