Improved: Adjust Working Directory with App Location, Retaining Relat…

…ive Location

source/Reloaded.Mod.Launcher.Lib/Models/ViewModel/Application/EditAppViewModel.cs

@@ -119,20 +119,47 @@ public void SetAppImage()
     /// </summary>
     public void SetNewExecutablePath()
     {
-        var result = SelectEXEFile();
-        if (string.IsNullOrEmpty(result))
+        var newFilePath = SelectEXEFile();
+        if (string.IsNullOrEmpty(newFilePath))
             return;
 
-        var isMsStore = TryUnprotectGamePassGame.TryIt(result);
-        result = SymlinkResolver.GetFinalPathName(result);
-        if (!Path.GetFileName(Application.Config.AppLocation).Equals(Path.GetFileName(result), StringComparison.OrdinalIgnoreCase))
+        var isMsStore = TryUnprotectGamePassGame.TryIt(newFilePath);
+        newFilePath = SymlinkResolver.GetFinalPathName(newFilePath);
+        if (!Path.GetFileName(Application.Config.AppLocation)
+                .Equals(Path.GetFileName(newFilePath), StringComparison.OrdinalIgnoreCase))
             Actions.DisplayMessagebox(Resources.AddAppWarningTitle.Get(), Resources.AddAppWarning.Get());
 
-        Application.Config.AppLocation = result;
+        // Update the AppLocation to the new executable path
+        Application.Config.AppLocation = newFilePath;
+        Application.Config.WorkingDirectory = CalculateNewRelativeDirectory(newFilePath);
+
+        // Handle MS store DRM and update.
         AddApplicationCommand.HandleAddedMsStoreBinary(isMsStore, Application.Path, Application.Config);
         Application.Save();
     }
 
+    private string CalculateNewRelativeDirectory(string newFilePath)
+    {
+        // Store old configuration values
+        var oldWorkingDirectory = Application.Config.WorkingDirectory;
+        var oldAppLocation = Application.Config.AppLocation;
+        var exeParent = Path.GetDirectoryName(newFilePath)!;
+
+        try
+        {
+            var relativePath = Path.GetRelativePath(oldWorkingDirectory, oldAppLocation);
+            // +1 to remove final backslash.
+            var newWorkingDirectory = newFilePath.Substring(0, newFilePath.Length - (relativePath.Length + 1));
+            return Directory.Exists(newWorkingDirectory) 
+                ? newWorkingDirectory
+                : exeParent;
+        }
+        catch (Exception)
+        {
+            return exeParent;
+        }
+    }
+
     /// <summary>
     /// Allows the user to pick a repository configuration and then test it.
     /// </summary>