Merge pull request #1588 from Dobby233Liu/fix-gms2-runner-discovery

Fix GMS2 runner discovery
UnderminersTeam · Jan 11, 2024 · fc8e082 · fc8e082
2 parents e8d68c4 + d89a9ab
commit fc8e082
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/UndertaleModTool/Settings.cs b/UndertaleModTool/Settings.cs
@@ -17,7 +17,7 @@ public class Settings
 
         public string Version { get; set; } = MainWindow.Version;
         public string GameMakerStudioPath { get; set; } = "%appdata%\\GameMaker-Studio";
-        public string GameMakerStudio2RuntimesPath { get; set; } = "%systemdrive%\\ProgramData\\GameMakerStudio2\\Cache\\runtimes"; /* Using %systemdrive% here fixes the runtimes not being found when the system drive is not C:\\ */
+        public string GameMakerStudio2RuntimesPath { get; set; } = "%ProgramData%\\GameMakerStudio2\\Cache\\runtimes";
         public bool AssetOrderSwappingEnabled { get; set; } = false;
         public bool ProfileModeEnabled { get; set; } = false;
         public bool UseGMLCache { get; set; } = false;

diff --git a/UndertaleModTool/Windows/RuntimePicker.xaml.cs b/UndertaleModTool/Windows/RuntimePicker.xaml.cs
@@ -102,6 +102,9 @@ private void DiscoverGMS2()
                     continue;
 
                 string runtimeRunner = System.IO.Path.Combine(runtimePath, @"windows\Runner.exe");
+                string runtimeRunnerX64 = System.IO.Path.Combine(runtimePath, @"windows\x64\Runner.exe");
+                if (Environment.Is64BitOperatingSystem && File.Exists(runtimeRunnerX64))
+                    runtimeRunner = runtimeRunnerX64;
                 if (!File.Exists(runtimeRunner))
                     continue;