fix

MewoLab · Nov 29, 2024 · 84281bb · 84281bb
1 parent bca22d2
commit 84281bb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/AquaMai/AquaMai.Config/ConfigSerializer.cs b/AquaMai/AquaMai.Config/ConfigSerializer.cs
@@ -3,6 +3,7 @@
 using System.Text;
 using AquaMai.Config.Attributes;
 using AquaMai.Config.Interfaces;
+using AquaMai.Config.Migration;
 using Tomlet.Models;
 
 namespace AquaMai.Config;
@@ -60,7 +61,7 @@ public string Serialize(IConfig config)
         }
 
         // Version
-        AppendEntry(sb, null, "Version", "2.0");
+        AppendEntry(sb, null, "Version", ConfigMigrationManager.Instance.LatestVersion);
 
         foreach (var section in ((Config)config).reflectionManager.SectionValues)
         {

diff --git a/AquaMai/AquaMai.Config/ConfigView.cs b/AquaMai/AquaMai.Config/ConfigView.cs
@@ -59,6 +59,12 @@ public void SetValue(string path, object value)
             }
             current = (TomlTable)next;
         }
+
+        if (value == null)
+        {
+            current.Keys.Remove(pathComponents.Last());
+            return;
+        }
         current.Put(pathComponents.Last(), value);
     }
 

diff --git a/AquaMai/AquaMai.Config/Migration/ConfigMigration_V2_0_V2_1.cs b/AquaMai/AquaMai.Config/Migration/ConfigMigration_V2_0_V2_1.cs
@@ -13,16 +13,14 @@ public class ConfigMigration_V2_0_V2_1 : IConfigMigration
 
     public IConfigView Migrate(IConfigView src)
     {
-        var dst = src;
-
-        dst.SetValue("Version", ToVersion);
+        src.SetValue("Version", ToVersion);
 
         if (src.GetValueOrDefault<bool>("Tweaks.ResetTouchAfterTrack"))
         {
-            dst.SetValue("Tweaks.ResetTouch.AfterTrack", true);
-            dst.SetValue("Tweaks.ResetTouchAfterTrack", null);
+            src.SetValue("Tweaks.ResetTouch.AfterTrack", true);
+            src.SetValue("Tweaks.ResetTouchAfterTrack", null);
         }
 
-        return dst;
+        return src;
     }
 }