From 677bba742e343271be39d4da6d10eca9720c0403 Mon Sep 17 00:00:00 2001
From: David <daullmer@gmail.com>
Date: Sun, 24 Jan 2021 13:34:22 +0100
Subject: [PATCH] Remove try-catch nesting

---
 .../Plugins/PluginManager.cs                    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/Emby.Server.Implementations/Plugins/PluginManager.cs b/Emby.Server.Implementations/Plugins/PluginManager.cs
index 9621b34b62..de4b71433a 100644
--- a/Emby.Server.Implementations/Plugins/PluginManager.cs
+++ b/Emby.Server.Implementations/Plugins/PluginManager.cs
@@ -112,16 +112,7 @@ namespace Emby.Server.Implementations.Plugins
                     {
                         assembly = Assembly.LoadFrom(file);
 
-                        try
-                        {
-                            assembly.GetExportedTypes();
-                        }
-                        catch (TypeLoadException ex) // Undocumented exception
-                        {
-                            _logger.LogError(ex, "Failed to load assembly {Path}. This error occurs when a plugin references an incompatible version of one of the shared libraries. Disabling plugin.", file);
-                            ChangePluginState(plugin, PluginStatus.NotSupported);
-                            continue;
-                        }
+                        assembly.GetExportedTypes();
                     }
                     catch (FileLoadException ex)
                     {
@@ -129,6 +120,12 @@ namespace Emby.Server.Implementations.Plugins
                         ChangePluginState(plugin, PluginStatus.Malfunctioned);
                         continue;
                     }
+                    catch (TypeLoadException ex) // Undocumented exception
+                    {
+                        _logger.LogError(ex, "Failed to load assembly {Path}. This error occurs when a plugin references an incompatible version of one of the shared libraries. Disabling plugin.", file);
+                        ChangePluginState(plugin, PluginStatus.NotSupported);
+                        continue;
+                    }
 
                     _logger.LogInformation("Loaded assembly {Assembly} from {Path}", assembly.FullName, file);
                     yield return assembly;