From 80489a4b29bc339847aaf8c271a2ed097ff1edd1 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Thu, 16 Jan 2020 11:54:41 -0500
Subject: [PATCH] Add error handling in case a developer accidentally defines
 an invalid version.

---
 oscar/main.cpp    | 10 ++++++++--
 oscar/version.cpp |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/oscar/main.cpp b/oscar/main.cpp
index 4119302a..0f71a773 100644
--- a/oscar/main.cpp
+++ b/oscar/main.cpp
@@ -542,11 +542,17 @@ int main(int argc, char *argv[]) {
 #endif
 
     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);
 //      release_notes();
 //      check_updates = false;
-    } else if (getVersion() < settingsVersion) {
+    } else if (currentVersion < settingsVersion) {
         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).").
                                  arg(AppSetting->versionString()) +"\n\n"+
diff --git a/oscar/version.cpp b/oscar/version.cpp
index b1a957c5..9636c29c 100644
--- a/oscar/version.cpp
+++ b/oscar/version.cpp
@@ -148,6 +148,10 @@ void Version::ParseSemanticVersion()
         mIsValid = true;
         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