Fix improperly initialized thread static field.

homothetyhk · Feb 20, 2022 · 5491313 · 5491313
1 parent 4dbfbed
commit 5491313
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/RandomizerCore/Json/LMConverter.cs b/RandomizerCore/Json/LMConverter.cs
@@ -55,7 +55,6 @@ public override void WriteJson(JsonWriter writer, LogicManager value, JsonSerial
 
             writer.WritePropertyName(nameof(value.VariableResolver));
             serializer.Serialize(writer, value.VariableResolver, typeof(VariableResolver));
-            Log($"Serialized VR as {value.VariableResolver.GetType().Name}");
 
             writer.WriteEndObject();
             serializer.Converters.Remove(LogicDefConverter.Instance);

diff --git a/RandomizerCore/Json/RandoContextConverter.cs b/RandomizerCore/Json/RandoContextConverter.cs
@@ -6,8 +6,8 @@ namespace RandomizerCore.Json
 {
     public class RandoContextConverter : JsonConverter<RandoContext>
     {
-        [ThreadStatic] public static bool canWrite = true;
-        public override bool CanWrite => canWrite;
+        [ThreadStatic] public static bool inUse;
+        public override bool CanWrite => !inUse;
 
         public override RandoContext ReadJson(JsonReader reader, Type objectType, RandoContext existingValue, bool hasExistingValue, JsonSerializer serializer)
         {
@@ -38,9 +38,9 @@ public override void WriteJson(JsonWriter writer, RandoContext value, JsonSerial
             serializer.Converters.Add(tc);
             serializer.Converters.Add(LogicDefConverter.Instance);
 
-            canWrite = false;
+            inUse = true;
             serializer.Serialize(writer, value);
-            canWrite = true;
+            inUse = false;
 
             serializer.Converters.Remove(LogicDefConverter.Instance);
             serializer.Converters.Remove(tc);