From d6dfb524bb268d80dccc5721c657816261c6d89e 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/Assembly-CSharp.dll | Bin 565760 -> 565760 bytes Refs/UnityEngine.CoreModule.dll | Bin 613888 -> 613888 bytes 3 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/Assembly-CSharp.dll b/Refs/Assembly-CSharp.dll index 8c98c0907505e355d32cb49d52acd375d1373fda..fac250fbe59c48c8e8d2ecd073ee99ca154cf717 100644 GIT binary patch delta 39 qcmZoTqSOFHEsQNpEzB(}TUgx;8Ts4Y4OxMh4T#ydyBl)sEC2uj_Y4*Q delta 39 qcmZoTqSOFHEsQNpEzB(}TUgx;8Ts1X4OxMh4T#ydyBl)sEC2uj