Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed folon/fo4 mixed collection issue #16311

Merged
merged 1 commit into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/extensions/nexus_integration/eventHandlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/nexus_integration/util/convertGameId.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down