diff --git a/RandomizerCore/Json/LMConverter.cs b/RandomizerCore/Json/LMConverter.cs index f793a9d..2149cbf 100644 --- 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 index 6967851..a0ab5cb 100644 --- a/RandomizerCore/Json/RandoContextConverter.cs +++ b/RandomizerCore/Json/RandoContextConverter.cs @@ -6,8 +6,8 @@ namespace RandomizerCore.Json { public class RandoContextConverter : JsonConverter { - [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);