More origin stripping fixes for ModKey/FormKey VMs

Mutagen-Modding · May 8, 2021 · 2d9c937 · 2d9c937
1 parent c4a97e4
commit 2d9c937
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/Mutagen.Bethesda.Synthesis.WPF/VMs/Settings/FormKeySettingsVM.cs b/Mutagen.Bethesda.Synthesis.WPF/VMs/Settings/FormKeySettingsVM.cs
@@ -12,7 +12,7 @@ namespace Mutagen.Bethesda.Synthesis.WPF
     public class FormKeySettingsVM : BasicSettingsVM<FormKey>
     {
         public FormKeySettingsVM(FieldMeta fieldMeta, object? defaultVal)
-            : base(fieldMeta, defaultVal is FormKey form ? StripOrigin(form) : null)
+            : base(fieldMeta, TryStripOrigin(defaultVal))
         {
         }
 
@@ -69,6 +69,16 @@ public static FormKey StripOrigin(FormKey formKey)
             return FormKey.Factory(formKey.ToString());
         }
 
+        public static FormKey? TryStripOrigin(object? o)
+        {
+            if (o == null) return null;
+            if (FormKey.TryFactory(o.ToString(), out var form))
+            {
+                return form;
+            }
+            return null;
+        }
+
         public override void WrapUp()
         {
             Value = StripOrigin(Value);

diff --git a/Mutagen.Bethesda.Synthesis.WPF/VMs/Settings/ModKeySettingsVM.cs b/Mutagen.Bethesda.Synthesis.WPF/VMs/Settings/ModKeySettingsVM.cs
@@ -18,7 +18,7 @@ public ModKeySettingsVM(
             IObservable<IChangeSet<ModKey>> detectedLoadOrder,
             FieldMeta fieldMeta, 
             object? defaultVal)
-            : base(fieldMeta, defaultVal)
+            : base(fieldMeta, TryStripOrigin(defaultVal))
         {
             DetectedLoadOrder = detectedLoadOrder;
         }
@@ -72,5 +72,15 @@ public static string Persist(ModKey modKey)
                 return modKey.ToString();
             }
         }
+
+        public static ModKey? TryStripOrigin(object? o)
+        {
+            if (o == null) return null;
+            if (ModKey.TryFromNameAndExtension(o.ToString(), out var modKey))
+            {
+                return modKey;
+            }
+            return null;
+        }
     }
 }