Merge branch 'main' of https://github.com/DarwinBaker/AATool

DarwinBaker · Jan 6, 2024 · 09e1a0e · 09e1a0e
2 parents 9c65258 + 48bfc6c
commit 09e1a0e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/AATool/Paths.cs b/AATool/Paths.cs
@@ -122,14 +122,15 @@ public static string SpeedrunDotComProfileJson(string idOrName) =>
         public static class Saves
         {
             public const string AppDataShortcut = "%AppData%\\Roaming";
+            private static readonly string AppDataFolderPath = GetFolderPath(SpecialFolder.ApplicationData);
 
             public static string CurrentFolder()
             {
                 if (Config.Tracking.UseSftp)
                     return System.SftpWorldsFolder;
 
                 return Tracker.Source is TrackerSource.CustomSavesPath
-                    ? Config.Tracking.CustomSavesPath.Value.Replace(AppDataShortcut, GetFolderPath(SpecialFolder.ApplicationData))
+                    ? Config.Tracking.CustomSavesPath.Value.Replace(AppDataShortcut, AppDataFolderPath)
                     : ActiveInstance.SavesPath;
             }
 

diff --git a/AATool/Utilities/ActiveInstance.cs b/AATool/Utilities/ActiveInstance.cs
@@ -115,7 +115,7 @@ private static bool TryGetActive(out Process instance)
                 Debug.EndTiming("get_active_instance");
 
                 //verify that process is an instance of minecraft 
-                if (active.ProcessName is "javaw" && active.MainWindowTitle.StartsWith("Minecraft"))
+                if (active.ProcessName.StartsWith("java") && active.MainWindowTitle.StartsWith("Minecraft"))
                     instance = active;
             }
             catch