simple version check

chrxh · Feb 3, 2023 · 51723b1 · 51723b1
1 parent 0616c7b
commit 51723b1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/source/EngineInterface/Serializer.cpp b/source/EngineInterface/Serializer.cpp
@@ -551,14 +551,21 @@ namespace
     {
         std::vector<std::string> versionParts;
         boost::split(versionParts, s, boost::is_any_of("."));
+        if (versionParts.size() < 3) {
+            return false;
+        }
         try {
             for (auto const& versionPart : versionParts) {
                 static_cast<void>(std::stoi(versionPart));
             }
+            //simple check: will be improved in future
+            if (std::stoi(versionParts.front()) > 3) {
+                return false;
+            }
         } catch (...) {
             return false;
         }
-        return versionParts.size() == 3;
+        return true;
     }
     struct VersionParts
     {
@@ -583,6 +590,7 @@ void Serializer::deserializeDataDescription(ClusteredDataDescription& data, std:
         throw std::runtime_error("No version detected.");
     }
     auto versionParts = getVersionParts(version);
+
     if (versionParts.major <= 3 && versionParts.minor <= 2) {
         DEPRECATED_ClusteredDataDescription_3_2 oldData;
         archive(oldData);

diff --git a/source/Gui/BrowserWindow.cpp b/source/Gui/BrowserWindow.cpp
@@ -349,7 +349,10 @@ void _BrowserWindow::onOpenSimulation(std::string const& id)
     }
 
     DeserializedSimulation deserializedSim;
-    Serializer::deserializeSimulationFromStrings(deserializedSim, content, settings, symbolMap);
+    if (!Serializer::deserializeSimulationFromStrings(deserializedSim, content, settings, symbolMap)) {
+        MessageDialog::getInstance().show("Error", "Failed to load simulation. Your program version may not match.");
+        return;
+    }
 
     _simController->closeSimulation();
     _statisticsWindow->reset();