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

chore: Use isFileAvailable instead of f_open

Browse Source
This commit is contained in:
Peter Feerick
2022-08-14 11:50:40 +10:00
committed by Peter Feerick
parent 15a19e1fef
commit c088d1d2f9
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/theme_manager.cpp
+6 -13
View File
@@ -299,24 +299,17 @@ void ThemeFile::applyBackground()
auto pos = backgroundImageFileName.rfind('/');
if (pos != std::string::npos) {
auto rootDir = backgroundImageFileName.substr(0, pos + 1);
rootDir = rootDir + "background_" + std::to_string(LCD_W) + "x" + std::to_string(LCD_H) + ".png";
rootDir = rootDir + "background_" + std::to_string(LCD_W) + "x" +
std::to_string(LCD_H) + ".png";
FIL file;
FRESULT result = f_open(&file, rootDir.c_str(), FA_OPEN_EXISTING);
if (result == FR_OK) {
if (isFileAvailable(rootDir.c_str())) {
instance->setBackgroundImageFileName((char *)rootDir.c_str());
f_close(&file);
} else {
// TODO: This needs to be made user configurable, not
// require the file be deleted to remove global background
char fileName[FF_MAX_LFN + 1];
fileName[FF_MAX_LFN] = '\0';
strncpy(fileName, THEMES_PATH, FF_MAX_LFN);
strcat(fileName, "/EdgeTX/background.png");
result = f_open(&file, fileName, FA_OPEN_EXISTING);
if (result == FR_OK) {
instance->setBackgroundImageFileName(fileName);
f_close(&file);
std::string fileName = THEMES_PATH PATH_SEPARATOR "EdgeTX/background.png";
if (isFileAvailable(fileName.c_str())) {
instance->setBackgroundImageFileName(fileName.c_str());
} else {
instance->setBackgroundImageFileName("");
}