From 8add6364dff993fa978177b8a0ecc23e350127b7 Mon Sep 17 00:00:00 2001 From: Anairkoen Schno Date: Sun, 29 Mar 2020 16:02:00 -0500 Subject: [PATCH] Fixed CustomObjectConverter --- IPA.Loader/Config/Stores/Converters.cs | 11 ++--------- IPA.Loader/Config/Stores/CustomObjectConverter.cs | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/IPA.Loader/Config/Stores/Converters.cs b/IPA.Loader/Config/Stores/Converters.cs index dc1b372b..b60fc936 100644 --- a/IPA.Loader/Config/Stores/Converters.cs +++ b/IPA.Loader/Config/Stores/Converters.cs @@ -84,15 +84,8 @@ namespace IPA.Config.Stores.Converters /// /// Gets the default for the current type. /// - public static ValueConverter Default - { - get - { - if (defaultConverter == null) - defaultConverter = MakeDefault(); - return defaultConverter; - } - } + public static ValueConverter Default + => defaultConverter ??= MakeDefault(); private static ValueConverter MakeDefault() { diff --git a/IPA.Loader/Config/Stores/CustomObjectConverter.cs b/IPA.Loader/Config/Stores/CustomObjectConverter.cs index c397fe37..f8e1a947 100644 --- a/IPA.Loader/Config/Stores/CustomObjectConverter.cs +++ b/IPA.Loader/Config/Stores/CustomObjectConverter.cs @@ -42,7 +42,7 @@ namespace IPA.Config.Stores.Converters } private static readonly IImpl impl = (IImpl)Activator.CreateInstance( - typeof(Impl<>).MakeGenericType(GeneratedStoreImpl.GetGeneratedType(typeof(T)))); + typeof(Impl<>).MakeGenericType(typeof(T), GeneratedStoreImpl.GetGeneratedType(typeof(T)))); /// /// Deserializes into a with the given .