chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add error handling in case a developer accidentally defines an invalid version.

Browse Source
This commit is contained in:
sawinglogz 2020-01-16 11:54:41 -05:00
parent c71a953afd
commit 80489a4b29
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oscar/main.cpp
View File

@ -542,11 +542,17 @@ int main(int argc, char *argv[]) {
#endif #endif
Version settingsVersion = Version(AppSetting->versionString()); Version settingsVersion = Version(AppSetting->versionString());
if (getVersion() > settingsVersion) { Version currentVersion = getVersion();
if (currentVersion.IsValid() == false) {
// The defined version MUST be valid, otherwise comparisons between versions will fail.
QMessageBox::critical(nullptr, STR_MessageBox_Error, QObject::tr("Version \"%1\" is invalid, cannot continue!").arg(currentVersion));
return 0;
}
if (currentVersion > settingsVersion) {
AppSetting->setShowAboutDialog(1); AppSetting->setShowAboutDialog(1);
// release_notes(); // release_notes();
// check_updates = false; // check_updates = false;
} else if (getVersion() < settingsVersion) { } else if (currentVersion < settingsVersion) {
if (QMessageBox::warning(nullptr, STR_MessageBox_Error, if (QMessageBox::warning(nullptr, STR_MessageBox_Error,
QObject::tr("The version of OSCAR you just ran is OLDER than the one used to create this data (%1)."). QObject::tr("The version of OSCAR you just ran is OLDER than the one used to create this data (%1).").
arg(AppSetting->versionString()) +"\n\n"+ arg(AppSetting->versionString()) +"\n\n"+

4
oscar/version.cpp
View File

@ -148,6 +148,10 @@ void Version::ParseSemanticVersion()
mIsValid = true; mIsValid = true;
break; break;
} }
// If we ever encounter any really old version whose version isn't valid, its
// major version will be 0, so it will correctly be considered older than
// valid versions.
} }
// Deal with non-Semantic-Versioning numbers used before 1.1.0-beta-2 to make sure they // Deal with non-Semantic-Versioning numbers used before 1.1.0-beta-2 to make sure they