From 9b2dbdcfe3a164d0fbd500bbc3cfe66b033668b2 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 9 Sep 2016 14:48:37 -0700 Subject: [PATCH] Fixed the key to delete profiles on Added fire and forget for task Added WaitUntil function on Automation Runner Added some documentation --- SlicerConfiguration/Settings/SettingsHelpers.cs | 5 +++-- Submodules/agg-sharp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SlicerConfiguration/Settings/SettingsHelpers.cs b/SlicerConfiguration/Settings/SettingsHelpers.cs index c23c85028..31b8e220b 100644 --- a/SlicerConfiguration/Settings/SettingsHelpers.cs +++ b/SlicerConfiguration/Settings/SettingsHelpers.cs @@ -445,6 +445,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration [JsonProperty(PropertyName = "ID")] private string id; + [JsonIgnore] public string ID { @@ -462,12 +463,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration if (File.Exists(existingProfilePath)) { // Profile ID change must come after existingProfilePath calculation and before ProfilePath getter - this.ID = value; + this.id = value; File.Move(existingProfilePath, ProfilePath); } else { - this.ID = value; + this.id = value; } if (File.Exists(ProfilePath)) diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 77d623e2a..369476aad 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 77d623e2ac17051e7a231c1ac665f93b21fad88b +Subproject commit 369476aada4201e57e2443716f29225398f2f185