Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 15:45:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed ViewController.cpp ifs - tentative fix
Some checks failed
Build ES-DE / Building_RetroDECK-ES-DE (push) Has been cancelled
Details

Browse source
This commit is contained in:
XargonWan 2024-10-28 16:33:31 +09:00
parent 9173b3cdc1
commit d3f0041043
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
es-app/src/guis/GuiMenu.cpp
View file

@ -2363,7 +2363,8 @@ void GuiMenu::addVersionInfo()
#endif #endif
#if defined(__RETRODECK__) #if defined(__RETRODECK__)
// Read version from /app/retrodeck/version if RETRODECK is defined // Only execute this block if RETRODECK is defined
LOG(LogInfo) << "Reading /app/retrodeck/version...";
std::ifstream versionFile("/app/retrodeck/version"); std::ifstream versionFile("/app/retrodeck/version");
std::string retroDeckVersion; std::string retroDeckVersion;
@ -2371,31 +2372,33 @@ void GuiMenu::addVersionInfo()
// also check that the line is not empty to ensure valid version information // also check that the line is not empty to ensure valid version information
if (versionFile && std::getline(versionFile, retroDeckVersion) && !retroDeckVersion.empty()) { if (versionFile && std::getline(versionFile, retroDeckVersion) && !retroDeckVersion.empty()) {
mVersion.setText(applicationName + " " + retroDeckVersion); mVersion.setText(applicationName + " " + retroDeckVersion);
LOG(LogInfo) << "RetroDECK version read OK.";
} else { } else {
std::cerr << "Error: Cannot read version from file or file is empty!" << std::endl; LOG(LogInfo) << "Error: Cannot read version from file or file is empty!";
retroDeckVersion = "UNKNOWN"; retroDeckVersion = "UNKNOWN";
mVersion.setText(applicationName + " " + retroDeckVersion); mVersion.setText(applicationName + " " + retroDeckVersion);
} }
#else // not RetroDECK
#if defined(IS_PRERELEASE) #else // If RETRODECK is NOT defined, execute this block
#if defined(__ANDROID__)
#if defined(IS_PRERELEASE)
#if defined(__ANDROID__)
mVersion.setText(applicationName + " " + Utils::String::toUpper(PROGRAM_VERSION_STRING) + "-" + mVersion.setText(applicationName + " " + Utils::String::toUpper(PROGRAM_VERSION_STRING) + "-" +
std::to_string(ANDROID_VERSION_CODE) + " (Built " + __DATE__ + ")"); std::to_string(ANDROID_VERSION_CODE) + " (Built " + __DATE__ + ")");
#else #else
mVersion.setText(applicationName + " " + Utils::String::toUpper(PROGRAM_VERSION_STRING) + mVersion.setText(applicationName + " " + Utils::String::toUpper(PROGRAM_VERSION_STRING) +
" (Built " + __DATE__ + ")"); " (Built " + __DATE__ + ")");
#endif #endif
#else #else
#if defined(__ANDROID__) #if defined(__ANDROID__)
mVersion.setText(applicationName + " " + Utils::String::toUpper(PROGRAM_VERSION_STRING) + "-" + mVersion.setText(applicationName + " " + Utils::String::toUpper(PROGRAM_VERSION_STRING) + "-" +
std::to_string(ANDROID_VERSION_CODE)); std::to_string(ANDROID_VERSION_CODE));
#else #else
mVersion.setText(applicationName + " " + Utils::String::toUpper(PROGRAM_VERSION_STRING)); mVersion.setText(applicationName + " " + Utils::String::toUpper(PROGRAM_VERSION_STRING));
#endif #endif
#endif #endif
#endif //RetroDECK #endif // End of RetroDECK logic check
} }
void GuiMenu::openThemeDownloader(GuiSettings* settings) void GuiMenu::openThemeDownloader(GuiSettings* settings)