Fix nested Persistent IConfigNode objects that each call LoadObjectFr…

…omConfig or CreateConfigFromObject (#86)
KSPModdingLibs · Aug 24, 2022 · e0b3157 · e0b3157
1 parent e663e18
commit e0b3157
Showing 1 changed file with 56 additions and 0 deletions.
diff --git a/KSPCommunityFixes/Modding/PersistentIConfigNode.cs b/KSPCommunityFixes/Modding/PersistentIConfigNode.cs
@@ -13,6 +13,17 @@ namespace KSPCommunityFixes.Modding
 {
     class PersistentIConfigNode : BasePatch
     {
+        private struct LoadState
+        {
+            public bool wasRemove;
+            public ReadLinkList links;
+            public LoadState(bool r, ReadLinkList l)
+            {
+                wasRemove = r;
+                links = l;
+            }
+        }
+
         protected override Version VersionMin => new Version(1, 8, 0);
 
         protected override void ApplyPatches(List<PatchInfo> patches)
@@ -35,6 +46,51 @@ protected override void ApplyPatches(List<PatchInfo> patches)
                 PatchMethodType.Prefix,
                 ConfigNode_WriteObject,
                 this));
+
+            patches.Add(new PatchInfo(
+                PatchMethodType.Prefix,
+                AccessTools.Method(typeof(ConfigNode), nameof(CreateConfigFromObject), new Type[] { typeof(object), typeof(int), typeof(ConfigNode) }),
+                this));
+
+            patches.Add(new PatchInfo(
+                PatchMethodType.Postfix,
+                AccessTools.Method(typeof(ConfigNode), nameof(CreateConfigFromObject), new Type[] { typeof(object), typeof(int), typeof(ConfigNode) }),
+                this));
+
+            patches.Add(new PatchInfo(
+                PatchMethodType.Prefix,
+                AccessTools.Method(typeof(ConfigNode), nameof(LoadObjectFromConfig), new Type[] { typeof(object), typeof(ConfigNode), typeof(int), typeof(bool) }),
+                this));
+
+            patches.Add(new PatchInfo(
+                PatchMethodType.Postfix,
+                AccessTools.Method(typeof(ConfigNode), nameof(LoadObjectFromConfig), new Type[] { typeof(object), typeof(ConfigNode), typeof(int), typeof(bool) }),
+                this));
+        }
+
+        // This will fail if nested, so we cache off the old writeLinks.
+        private static void ConfigNode_CreateConfigFromObject_Prefix(out WriteLinkList __state)
+        {
+            __state = writeLinks;
+        }
+
+        // and restore it
+        private static void ConfigNode_CreateConfigFromObject_Postfix(WriteLinkList __state)
+        {
+            writeLinks = __state;
+        }
+
+        // This will fail if nested, so we cache off the old readlinks and remove.
+        private static void ConfigNode_LoadObjectFromConfig_Prefix(out LoadState __state)
+        {
+            __state = new LoadState(removeAfterUse, readLinks);
+        }
+
+        // and restore them
+        private static void ConfigNode_LoadObjectFromConfig_Postfix(LoadState __state)
+        {
+            removeAfterUse = __state.wasRemove;
+            readLinks = __state.links;
         }
 
         private static bool ConfigNode_WriteObject_Prefix(object obj, ConfigNode node, int pass)