From d30f81ecbd6ff7599c0c82a7b9afab1f4d608171 Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Tue, 24 Dec 2019 00:28:39 -0600 Subject: [PATCH 1/2] Removed recursiveness when checking for .wabbajack for valid MO2 installs --- Wabbajack.Lib/MO2Installer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Wabbajack.Lib/MO2Installer.cs b/Wabbajack.Lib/MO2Installer.cs index 3d19ccd6..52d6909e 100644 --- a/Wabbajack.Lib/MO2Installer.cs +++ b/Wabbajack.Lib/MO2Installer.cs @@ -327,7 +327,7 @@ namespace Wabbajack.Lib if (!Directory.Exists(path)) return ErrorResponse.Success; // Check folder does not have a wabbajack modlist - foreach (var file in Directory.EnumerateFiles(path, DirectoryEnumerationOptions.Recursive)) + foreach (var file in Directory.EnumerateFiles(path)) { if (!File.Exists(file)) continue; if (System.IO.Path.GetExtension(file).Equals(ExtensionManager.Extension)) From 1be9b49ae90264d45521781bb8dc285784c94599 Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Tue, 24 Dec 2019 00:48:47 -0600 Subject: [PATCH 2/2] Offloaded MO2InstallerVM's validity check to the background thread --- Wabbajack/View Models/Installers/MO2InstallerVM.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Wabbajack/View Models/Installers/MO2InstallerVM.cs b/Wabbajack/View Models/Installers/MO2InstallerVM.cs index 44ac1491..3982a31b 100644 --- a/Wabbajack/View Models/Installers/MO2InstallerVM.cs +++ b/Wabbajack/View Models/Installers/MO2InstallerVM.cs @@ -58,10 +58,10 @@ namespace Wabbajack Location.AdditionalError = Observable.CombineLatest( this.WhenAny(x => x.Location.TargetPath), this.WhenAny(x => x.DownloadLocation.TargetPath), - resultSelector: (target, download) => - { - return MO2Installer.CheckValidInstallPath(target, download); - }); + resultSelector: (target, download) => (target, download)) + .ObserveOn(RxApp.MainThreadScheduler) + .Select(i => MO2Installer.CheckValidInstallPath(i.target, i.download)) + .ObserveOnGuiThread(); CanInstall = Observable.CombineLatest( this.WhenAny(x => x.Location.InError),