diff --git a/Wabbajack/Settings.cs b/Wabbajack/Settings.cs index a7b51d27..c2b2a28d 100644 --- a/Wabbajack/Settings.cs +++ b/Wabbajack/Settings.cs @@ -53,6 +53,7 @@ namespace Wabbajack public class InstallationSettings { public string InstallationLocation { get; set; } + public string StagingLocation { get; set; } public string DownloadLocation { get; set; } } diff --git a/Wabbajack/View Models/InstallerVM.cs b/Wabbajack/View Models/InstallerVM.cs index 3761ff1e..1a0728b1 100644 --- a/Wabbajack/View Models/InstallerVM.cs +++ b/Wabbajack/View Models/InstallerVM.cs @@ -129,12 +129,15 @@ namespace Wabbajack }; // Load settings - InstallationSettings settings = this.MWVM.Settings.InstallationSettings.TryCreate(source); + var settings = MWVM.Settings.InstallationSettings.TryCreate(source); this.MWVM.Settings.SaveSignal .Subscribe(_ => { - settings.InstallationLocation = this.Location.TargetPath; - settings.DownloadLocation = this.DownloadLocation.TargetPath; + settings.DownloadLocation = DownloadLocation.TargetPath; + if (IsMO2ModList) + settings.InstallationLocation = Location.TargetPath; + else + settings.StagingLocation = StagingLocation.TargetPath; }) .DisposeWith(this.CompositeDisposable); @@ -163,6 +166,8 @@ namespace Wabbajack if (modList.ModManager == ModManager.Vortex) { IsMO2ModList = false; + StagingLocation.TargetPath = settings.StagingLocation; + var vortexFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Vortex");