From 84346cbfa1423a2aed88f99d658c61a298373da1 Mon Sep 17 00:00:00 2001 From: Anairkoen Schno Date: Mon, 6 May 2019 16:03:17 -0500 Subject: [PATCH] Added more null checking in some error handling code in the legacy plugin loader --- IPA.Loader/Loader/PluginManager.cs | 2 +- Refs/UnityEngine.CoreModule.dll | Bin 613888 -> 613888 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/IPA.Loader/Loader/PluginManager.cs b/IPA.Loader/Loader/PluginManager.cs index 8d13dbb7..f69f49c2 100644 --- a/IPA.Loader/Loader/PluginManager.cs +++ b/IPA.Loader/Loader/PluginManager.cs @@ -241,7 +241,7 @@ namespace IPA.Loader catch (ReflectionTypeLoadException e) { Logger.loader.Error($"Could not load the following types from {Path.GetFileName(file)}:"); - Logger.loader.Error($" {string.Join("\n ", e.LoaderExceptions.Select(e1 => e1?.Message))}"); + Logger.loader.Error($" {string.Join("\n ", e.LoaderExceptions?.Select(e1 => e1?.Message) ?? new string[0])}"); } catch (Exception e) { diff --git a/Refs/UnityEngine.CoreModule.dll b/Refs/UnityEngine.CoreModule.dll index 6b046156bb0f6155dbdd8fd9a02dff74c94f4579..78b2946a9ac644b4b02e3dde8196dfb9b03c0fa9 100644 GIT binary patch delta 43 scmZqJquKyOEsQNpEzB(}TUf)w82Q`7!&rfs4T#x+m}7f*80SiM075Jc*#H0l delta 43 scmZqJquKyOEsQNpEzB(}TUf)w82Q@6!&rfs4T#x+m}7f*80SiM074ZF*Z=?k