From e375da6a0cf75cd39060eb7f031f5d1f396e3ab5 Mon Sep 17 00:00:00 2001 From: Chris Bessent Date: Sat, 6 Feb 2021 09:15:22 -0700 Subject: [PATCH] Fix finding Origin games --- Wabbajack.Common/StoreHandlers/OriginHandler.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Wabbajack.Common/StoreHandlers/OriginHandler.cs b/Wabbajack.Common/StoreHandlers/OriginHandler.cs index 9620818c..a64e6035 100644 --- a/Wabbajack.Common/StoreHandlers/OriginHandler.cs +++ b/Wabbajack.Common/StoreHandlers/OriginHandler.cs @@ -70,11 +70,9 @@ namespace Wabbajack.Common.StoreHandlers { try { - - foreach (var game in GameRegistry.Games) { - var mfst = game.Value.OriginIDs.FirstOrDefault(g => KnownMFSTs.Contains(g.Replace(":", ""))); + var mfst = game.Value.OriginIDs.FirstOrDefault(g => KnownMFSTs.Contains(g)); if (mfst == null) continue; @@ -91,7 +89,7 @@ namespace Wabbajack.Common.StoreHandlers } } } - + public sealed class OriginGame : AStoreGame { private string _mfst; @@ -123,12 +121,12 @@ namespace Wabbajack.Common.StoreHandlers { var manifestData = GetAndCacheManifestResponse(this._mfst).FromJsonString(); var platform = manifestData!.publishing!.softwareList!.software!.FirstOrDefault(a => a.softwarePlatform == "PCWIN"); - + var installPath = GetPathFromPlatformPath(platform!.fulfillmentAttributes!.installCheckOverride!); return installPath; } - + internal AbsolutePath GetPathFromPlatformPath(string path, RegistryView platformView) { if (!path.StartsWith("[")) @@ -169,7 +167,7 @@ namespace Wabbajack.Common.StoreHandlers return (AbsolutePath)keyValue!.ToString()!; } - + internal AbsolutePath GetPathFromPlatformPath(string path) { var resultPath = GetPathFromPlatformPath(path, RegistryView.Registry64);