From f8e9d68ceba363b5ddbd921d2871d88284a20af4 Mon Sep 17 00:00:00 2001
From: Westin Miller <equinoxscripts@gmail.com>
Date: Mon, 13 Aug 2018 19:33:38 -0700
Subject: [PATCH] Don't unregister plugin assembly resolver.

---
 Torch/Plugins/PluginManager.cs | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs
index b2531ea..f92b230 100644
--- a/Torch/Plugins/PluginManager.cs
+++ b/Torch/Plugins/PluginManager.cs
@@ -325,21 +325,19 @@ namespace Torch.Managers
                     if (IsAssemblyCompatible(requiredAssemblyName, asm.GetName()))
                         return asm;
                 }
-                _log.Warn($"Could find dependent assembly! Requesting assembly: {args.RequestingAssembly}, dependent assembly: {requiredAssemblyName}");
+                foreach (var asm in assemblies)
+                    if (asm == args.RequestingAssembly)
+                    {
+                        _log.Warn($"Could find dependent assembly! Requesting assembly: {args.RequestingAssembly}, dependent assembly: {requiredAssemblyName}");
+                        break;
+                    }
                 return null;
             }
 
-            try
+            AppDomain.CurrentDomain.AssemblyResolve += ResolveDependentAssembly;
+            foreach (Assembly asm in assemblies)
             {
-                AppDomain.CurrentDomain.AssemblyResolve += ResolveDependentAssembly;
-                foreach (Assembly asm in assemblies)
-                {
-                    TorchBase.RegisterAuxAssembly(asm);
-                }
-            }
-            finally
-            {
-                AppDomain.CurrentDomain.AssemblyResolve -= ResolveDependentAssembly;
+                TorchBase.RegisterAuxAssembly(asm);
             }
         }