diff --git a/Wabbajack.Common/StoreHandlers/StoreHandler.cs b/Wabbajack.Common/StoreHandlers/StoreHandler.cs index ae4a26c4..e88da2fb 100644 --- a/Wabbajack.Common/StoreHandlers/StoreHandler.cs +++ b/Wabbajack.Common/StoreHandlers/StoreHandler.cs @@ -40,7 +40,7 @@ namespace Wabbajack.Common.StoreHandlers foreach (var game in handler.Games) { - Utils.Log($"{handler.StoreType}: Found game {game}"); + Utils.Log($"{handler.StoreType}: Found game {game} at \"{game.Path}\""); _storeGames.Add(game); } } @@ -86,9 +86,10 @@ namespace Wabbajack.Common.StoreHandlers public AbsolutePath? TryGetGamePath(Game game) { - if (Games.TryGetValue(game, out var storeGame)) - return (AbsolutePath) storeGame.Path; - return null; + if (!Games.TryGetValue(game, out var storeGame)) + return null; + + return (AbsolutePath)storeGame.Path; } public static void Warmup() diff --git a/Wabbajack.Lib/MO2Installer.cs b/Wabbajack.Lib/MO2Installer.cs index 0f36ceb8..530cbd62 100644 --- a/Wabbajack.Lib/MO2Installer.cs +++ b/Wabbajack.Lib/MO2Installer.cs @@ -65,6 +65,12 @@ namespace Wabbajack.Lib if (GameFolder == null) GameFolder = Game.TryGetGameLocation(); + if (GameFolder is { Exists: false }) + { + Utils.Error($"Located game {Game.HumanFriendlyGameName} at \"{GameFolder.Value}\" but the folder does not exist!"); + return false; + } + if (GameFolder == null) { var otherGame = Game.CommonlyConfusedWith.Where(g => g.MetaData().IsInstalled).Select(g => g.MetaData()).FirstOrDefault();