Merge pull request #61 from ZehMatt/fix-60

#60: Place cache in x64/x86 directories
x64dbg · Sep 17, 2022 · 2ade8ad · 2ade8ad
2 parents fe8657f + 56352ec
commit 2ade8ad
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/src/Dotx64Managed/Plugins.Hotload.cs b/src/Dotx64Managed/Plugins.Hotload.cs
@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.Loader;
 using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
@@ -521,7 +520,7 @@ bool ReloadPlugin(Plugin plugin, string newAssemblyPath, CancellationToken token
                             }
                             catch (Exception ex)
                             {
-                                throw;
+                                Utils.PrintException(ex);
                             }
                         }
                     }

diff --git a/src/Dotx64Managed/Plugins.cs b/src/Dotx64Managed/Plugins.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Dotx64Dbg
 {
@@ -73,12 +70,12 @@ private void SetupDirectories()
             Console.WriteLine("DotX64Dbg Plugins Path: {0}", PluginsPath);
 
             AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "DotX64Dbg");
-            if (!Directory.Exists(AppDataPath))
-            {
-                Directory.CreateDirectory(AppDataPath);
-            }
-
-            PluginOutputPath = Path.Combine(AppDataPath, "Plugins");
+#if _X64_
+            PluginOutputPath = Path.Combine(AppDataPath, "x64");
+#else
+            PluginOutputPath = Path.Combine(AppDataPath, "x86");
+#endif
+            PluginOutputPath = Path.Combine(PluginOutputPath, "Plugins");
             if (!Directory.Exists(PluginOutputPath))
             {
                 Directory.CreateDirectory(PluginOutputPath);

diff --git a/src/Dotx64Managed/ScriptLoader.cs b/src/Dotx64Managed/ScriptLoader.cs
@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace Dotx64Dbg
@@ -28,12 +26,12 @@ private static bool RunScriptCommand(string[] args)
         private static void SetupDirectories()
         {
             string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "DotX64Dbg");
-            if (!Directory.Exists(AppDataPath))
-            {
-                Directory.CreateDirectory(AppDataPath);
-            }
-
-            ScriptBuildOutputPath = Path.Combine(AppDataPath, "Scripts");
+#if _X64_
+            ScriptBuildOutputPath = Path.Combine(AppDataPath, "x64");
+#else
+            ScriptBuildOutputPath = Path.Combine(AppDataPath, "x86");
+#endif
+            ScriptBuildOutputPath = Path.Combine(ScriptBuildOutputPath, "Scripts");
             if (!Directory.Exists(ScriptBuildOutputPath))
             {
                 Directory.CreateDirectory(ScriptBuildOutputPath);