Add support for relative T3 FM install path when SU is portable

FenPhoenix · Aug 25, 2023 · cf91afd · cf91afd
1 parent 30409ac
commit cf91afd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/AngelLoader/Common/Paths.cs b/AngelLoader/Common/Paths.cs
@@ -343,15 +343,15 @@ internal static string GetThiefBuddyExePath()
     private const string _sneakyOptionsIni = "SneakyOptions.ini";
     private static readonly Version _sneakyUpgradeMinimumPortableVersion = new(1, 1, 10, 519);
 
-    internal static string GetSneakyOptionsIni()
+    internal static (string SoIni, bool IsPortable) GetSneakyOptionsIni()
     {
         if (TryGetSneakyOptionsIniFromGameDir(out string soIni))
         {
-            return soIni;
+            return (soIni, true);
         }
         else
         {
-            return GetSneakyOptionsIniFromRegistry();
+            return (GetSneakyOptionsIniFromRegistry(), false);
         }
     }
 

diff --git a/AngelLoader/GameConfigFiles.cs b/AngelLoader/GameConfigFiles.cs
@@ -188,7 +188,7 @@ internal static (Error Error, bool UseCentralSaves, string FMInstallPath,
                      string PrevFMSelectorValue, bool AlwaysShowLoader)
     GetInfoFromSneakyOptionsIni()
     {
-        string soIni = Paths.GetSneakyOptionsIni();
+        (string soIni, bool isPortable) = Paths.GetSneakyOptionsIni();
         if (soIni.IsEmpty())
         {
             return (Error.SneakyOptionsNotFound, false, "", "", false);
@@ -271,6 +271,25 @@ internal static (Error Error, bool UseCentralSaves, string FMInstallPath,
             }
         }
 
+        if (isPortable && PathIsRelative(fmInstPath))
+        {
+            try
+            {
+                string? soIniDir = Path.GetDirectoryName(soIni);
+                if (soIniDir != null)
+                {
+                    fmInstPath = RelativeToAbsolute(soIniDir, fmInstPath);
+                    Directory.CreateDirectory(fmInstPath);
+                }
+            }
+            catch (Exception ex)
+            {
+                Log("Unable to resolve the relative path " + fmInstPath + " with the absolute path where " + soIni + " is contained. Returning blank path.", ex);
+                fmInstPath = "";
+                fmInstPathFound = false;
+            }
+        }
+
         return fmInstPathFound
             ? (Error.None, !ignoreSavesKey, fmInstPath, prevFMSelectorValue, alwaysShowLoader)
             : (Error.GeneralSneakyOptionsIniError, false, "", prevFMSelectorValue, alwaysShowLoader);
@@ -716,7 +735,7 @@ internal static bool SetT3FMSelector(bool resetSelector = false)
         bool existingAlwaysShowKeyOverwritten = false;
         int insertLineIndex = -1;
 
-        string soIni = Paths.GetSneakyOptionsIni();
+        (string soIni, _) = Paths.GetSneakyOptionsIni();
         if (soIni.IsEmpty())
         {
             return false;