From 1690998e0cd318e3fffcc40242cb3be2e1f31b7b Mon Sep 17 00:00:00 2001 From: Dave Corley Date: Tue, 10 Jun 2025 22:55:02 -0700 Subject: [PATCH] FEAT: Check for installations from the current directory before parent directories, but after explicitly-specified ones --- TES3Merge/Util/Installation.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/TES3Merge/Util/Installation.cs b/TES3Merge/Util/Installation.cs index 1657925..dc29436 100644 --- a/TES3Merge/Util/Installation.cs +++ b/TES3Merge/Util/Installation.cs @@ -72,8 +72,12 @@ private static bool IsValidInstallationDirectory(string path) return explicitPath; } + var cwd = Directory.GetCurrentDirectory(); + if (IsValidInstallationDirectory(cwd)) + return cwd; + // Search all parent directories for Morrowind/OpenMW. - for (var directory = new DirectoryInfo(Directory.GetCurrentDirectory()); directory is not null; directory = directory.Parent) + for (var directory = new DirectoryInfo(cwd); directory is not null; directory = directory.Parent) { if (IsValidInstallationDirectory(directory.FullName)) { @@ -260,7 +264,8 @@ private void BuildArchiveList() for (var i = 0; true; ++i) { var archive = configArchives["Archive " + i]; - if (string.IsNullOrEmpty(archive)) { + if (string.IsNullOrEmpty(archive)) + { break; } Archives.Add(archive);