Merge pull request #16311 from Nexus-Mods/16305-folon-collection-issues

fixed folon/fo4 mixed collection issue
Nexus-Mods · Sep 12, 2024 · 93e1919 · 93e1919
2 parents c9b744b + 5a8127c
commit 93e1919
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/extensions/nexus_integration/eventHandlers.ts b/src/extensions/nexus_integration/eventHandlers.ts
@@ -552,9 +552,11 @@ export function onDownloadUpdate(api: IExtensionApi,
     }
 
     const state = api.getState();
-    const game = (gameId === SITE_ID) ? null : gameById(state, gameId) || currentGame(state);
-
-    if (game === undefined) {
+    const game = (gameId === SITE_ID) ? null : gameById(state, gameId);
+    const activeGame = currentGame(state);
+    const compatibleDownloads = activeGame?.details?.compatibleDownloads || [];
+    const hasCompatibleDownloadId = compatibleDownloads.includes(gameId);
+    if (game === undefined && !hasCompatibleDownloadId) {
       api.sendNotification({
         type: 'error',
         title: 'Invalid game id',

diff --git a/src/extensions/nexus_integration/util/convertGameId.ts b/src/extensions/nexus_integration/util/convertGameId.ts
@@ -94,7 +94,7 @@ export function toNXMId(game: IGameStoredExt, gameId: string): string {
   if (game === null) {
     return SITE_ID;
   }
-  if (game.details !== undefined) {
+  if (game?.details !== undefined) {
     if (game.details.nxmLinkId !== undefined) {
       return game.details.nxmLinkId;
     } else if (game.details.nexusPageId !== undefined) {