From 149c2b2169192da29d82c440175d8d9049dea8b3 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 31 Dec 2020 11:39:34 +0000
Subject: [PATCH] Added referenced assembly failure detection, and DI failure
 protection.

---
 Emby.Server.Implementations/ApplicationHost.cs       | 2 ++
 Emby.Server.Implementations/Plugins/PluginManager.cs | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 094134318c..1b9bb86bbd 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -413,6 +413,8 @@ namespace Emby.Server.Implementations
             catch (Exception ex)
             {
                 Logger.LogError(ex, "Error creating {Type}", type);
+                // If this is a plugin fail it.
+                _pluginManager.FailPlugin(type.Assembly);
                 return null;
             }
             finally
diff --git a/Emby.Server.Implementations/Plugins/PluginManager.cs b/Emby.Server.Implementations/Plugins/PluginManager.cs
index 51a75f6a39..1ab01252d0 100644
--- a/Emby.Server.Implementations/Plugins/PluginManager.cs
+++ b/Emby.Server.Implementations/Plugins/PluginManager.cs
@@ -111,6 +111,10 @@ namespace Emby.Server.Implementations.Plugins
                     try
                     {
                         assembly = Assembly.LoadFrom(file);
+
+                        // This force loads all reference dll's that the plugin uses in the try..catch block.
+                        // Removing this will cause JF to bomb out if referenced dll's cause issues.
+                        assembly.GetExportedTypes();
                     }
                     catch (FileLoadException ex)
                     {