piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(color): personal templates saved to wrong folder (#4886)

Browse Source
This commit is contained in:
philmoz
2024-04-25 09:13:07 +10:00
committed by GitHub
parent 568d31f2d7
commit 7791216063
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/model_select.cpp
+13 -5
View File
@@ -420,18 +420,26 @@ class ModelsPageBody : public Window
char modelName[size];
snprintf(modelName, size, "%s%s", model->modelName, YAML_EXT);
char templatePath[FF_MAX_LFN];
snprintf(templatePath, FF_MAX_LFN, "%s%c%s", PERS_TEMPL_PATH, '/',
modelName);
sdCheckAndCreateDirectory(TEMPLATES_PATH);
sdCheckAndCreateDirectory(PERS_TEMPL_PATH);
const char* persFolder = nullptr;
if (isFileAvailable(PERS_TEMPL_PATH)) {
persFolder = PERS_TEMPL_PATH;
} else if (isFileAvailable(PERS_TEMPL_PATH_OLD)) {
persFolder = PERS_TEMPL_PATH_OLD;
} else {
persFolder = PERS_TEMPL_PATH;
sdCheckAndCreateDirectory(PERS_TEMPL_PATH);
}
snprintf(templatePath, FF_MAX_LFN, "%s%c%s", persFolder, '/',
modelName);
if (isFileAvailable(templatePath)) {
new ConfirmDialog(parent, STR_FILE_EXISTS, STR_ASK_OVERWRITE, [=] {
sdCopyFile(model->modelFilename, MODELS_PATH, modelName,
PERS_TEMPL_PATH);
persFolder);
});
} else {
sdCopyFile(model->modelFilename, MODELS_PATH, modelName,
PERS_TEMPL_PATH);
persFolder);
}
});
}
radio/src/sdcard.h
+2 -1
View File
@@ -37,7 +37,8 @@ extern FIL g_oLogFile;
#define UNUSED_MODELS_PATH MODELS_PATH PATH_SEPARATOR "UNUSED"
#define RADIO_PATH ROOT_PATH "RADIO" // no trailing slash = important
#define TEMPLATES_PATH ROOT_PATH "TEMPLATES"
#define PERS_TEMPL_PATH TEMPLATES_PATH "/PERSONAL"
#define PERS_TEMPL_PATH TEMPLATES_PATH "/2.Personal"
#define PERS_TEMPL_PATH_OLD TEMPLATES_PATH "/PERSONAL"
#define LOGS_PATH ROOT_PATH "LOGS"
#define SCREENSHOTS_PATH ROOT_PATH "SCREENSHOTS"
#define SOUNDS_PATH ROOT_PATH "SOUNDS/en"