Re-enable additionalProbingPaths workaround for Lang loading

Ryochan7 · Nov 27, 2022 · 1bc18c6 · 1bc18c6
1 parent 276df65
commit 1bc18c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/DS4Windows/App.xaml.cs b/DS4Windows/App.xaml.cs
@@ -192,10 +192,10 @@ private void Application_Startup(object sender, StartupEventArgs e)
             }
 
             // Discover and load possible Lang assemblies
-            PrepareLangAssemblies();
+            //PrepareLangAssemblies();
             // Add hook to have .NET find the Lang assemblies. Loading will be performed
             // during MainWindow.InitializeComponent
-            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+            //AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
             // Have app use selected culture
             SetUICulture(DS4Windows.Global.UseLang);
             DS4Windows.AppThemeChoice themeChoice = DS4Windows.Global.UseCurrentTheme;
@@ -210,7 +210,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
             window.Show();
 
             // Remove hook for custom assembly loading. Needed or app performance drops
-            AppDomain.CurrentDomain.AssemblyResolve -= CurrentDomain_AssemblyResolve;
+            //AppDomain.CurrentDomain.AssemblyResolve -= CurrentDomain_AssemblyResolve;
 
             // Set up hooks for IPC command calls
             HwndSource source = PresentationSource.FromVisual(window) as HwndSource;

diff --git a/DS4Windows/runtimeconfig.template.json b/DS4Windows/runtimeconfig.template.json
@@ -1,2 +1,5 @@
 {
+  "additionalProbingPaths": [
+    "./Lang/"
+  ]
 }