From a19437f42fb4f40cc3ca3b0b7e230ec0664c1505 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 12 Nov 2024 16:07:27 -0500 Subject: [PATCH] More efficient checks --- .../Serializers/BaseBinarySerializer.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SabreTools.Serialization/Serializers/BaseBinarySerializer.cs b/SabreTools.Serialization/Serializers/BaseBinarySerializer.cs index a3da6362..841eb2cc 100644 --- a/SabreTools.Serialization/Serializers/BaseBinarySerializer.cs +++ b/SabreTools.Serialization/Serializers/BaseBinarySerializer.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using System.Reflection; using SabreTools.Serialization.Interfaces; @@ -107,12 +106,13 @@ namespace SabreTools.Serialization.Serializers if (serializerName == null) return default; - // If the serializer has no model type - Type? modelType = typeof(TSerializer).GetGenericArguments()?.FirstOrDefault(); - if (modelType == null) + // If the serializer has no generic arguments + var genericArgs = typeof(TSerializer).GetGenericArguments(); + if (genericArgs == null || genericArgs.Length == 0) return default; // Loop through all loaded assemblies + Type modelType = genericArgs[0]; foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) { // If the assembly is invalid