From e29bf116319e49893c11eb436d32831164ebfa15 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Thu, 4 Aug 2016 08:57:14 -0700 Subject: [PATCH] Skip migrations if DocumentVersion missing - Disable old migrations - Issue MatterHackers/MCCentral#252 --- SlicerConfiguration/Settings/PrinterSettings.cs | 2 +- SlicerConfiguration/Settings/ProfileMigrations.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SlicerConfiguration/Settings/PrinterSettings.cs b/SlicerConfiguration/Settings/PrinterSettings.cs index 9151f3d8f..aef26ffb0 100644 --- a/SlicerConfiguration/Settings/PrinterSettings.cs +++ b/SlicerConfiguration/Settings/PrinterSettings.cs @@ -266,7 +266,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } } - int documentVersion = jObject?.GetValue("DocumentVersion")?.Value() ?? 0; + int documentVersion = jObject?.GetValue("DocumentVersion")?.Value() ?? PrinterSettings.LatestVersion; if (documentVersion < PrinterSettings.LatestVersion) { printerProfilePath = ProfileMigrations.MigrateDocument(printerProfilePath, documentVersion); diff --git a/SlicerConfiguration/Settings/ProfileMigrations.cs b/SlicerConfiguration/Settings/ProfileMigrations.cs index 8d7d69a0a..0881c4695 100644 --- a/SlicerConfiguration/Settings/ProfileMigrations.cs +++ b/SlicerConfiguration/Settings/ProfileMigrations.cs @@ -44,6 +44,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { var jObject = JObject.Parse(File.ReadAllText(filePath)); + /* if (fromVersion < 201605131) { var materialLayers = jObject["MaterialLayers"] as JObject; @@ -94,6 +95,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration File.Delete(filePath); filePath = Path.Combine(Path.GetDirectoryName(filePath), printerID + ProfileManager.ProfileExtension); } + */ if (fromVersion < 201606081) {