From 447e8f59e5a13dc5f1be0e92a7e55883a25b9048 Mon Sep 17 00:00:00 2001 From: "J.D. Purcell" Date: Fri, 1 Nov 2019 22:54:14 -0400 Subject: [PATCH] To match master (merge error?) --- BizHawk.Client.EmuHawk/Program.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/BizHawk.Client.EmuHawk/Program.cs b/BizHawk.Client.EmuHawk/Program.cs index 335f539b7b..2c4627d377 100644 --- a/BizHawk.Client.EmuHawk/Program.cs +++ b/BizHawk.Client.EmuHawk/Program.cs @@ -77,9 +77,6 @@ namespace BizHawk.Client.EmuHawk // for Unix, skip everything else and just wire up the event handler AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; } - - // Assembly.ReflectionOnlyLoadFrom doesn't automatically load deps, this stops it from throwing when called - AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += (sender, args) => Assembly.ReflectionOnlyLoad(args.Name); } [STAThread]