Skip to content

Commit

Permalink
[Fix] Some default settings not being applied (#3543)
Browse files Browse the repository at this point in the history
fix some default settings not being applied
  • Loading branch information
Etaash-mathamsetty authored Feb 10, 2024
1 parent 2b0b6c9 commit 492aec0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
8 changes: 7 additions & 1 deletion src/backend/game_config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ class GameConfigV0 extends GameConfig {

const {
autoInstallDxvk,
autoInstallDxvkNvapi,
autoInstallVkd3d,
preferSystemLibs,
autoSyncSaves,
Expand All @@ -227,13 +228,16 @@ class GameConfigV0 extends GameConfig {
winePrefix,
wineCrossoverBottle,
wineVersion,
useSteamRuntime
useSteamRuntime,
eacRuntime,
battlEyeRuntime
} = GlobalConfig.get().getSettings()

// initialize generic defaults
// TODO: I know more values can be moved that are not used in windows
const defaultSettings = {
autoInstallDxvk,
autoInstallDxvkNvapi,
autoInstallVkd3d,
preferSystemLibs,
autoSyncSaves,
Expand All @@ -252,6 +256,8 @@ class GameConfigV0 extends GameConfig {
targetExe,
useGameMode,
useSteamRuntime,
battlEyeRuntime,
eacRuntime,
language: '' // we want to fallback to '' always here, fallback lang for games should be ''
} as GameSettings

Expand Down
12 changes: 0 additions & 12 deletions src/backend/launcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -381,18 +381,6 @@ async function prepareWineLaunch(
await download('battleye_runtime')
}

if (gameSettings.eacRuntime && !isInstalled('eac_runtime') && isOnline()) {
await download('eac_runtime')
}

if (
gameSettings.battlEyeRuntime &&
!isInstalled('battleye_runtime') &&
isOnline()
) {
await download('battleye_runtime')
}

const { folder_name: installFolderName } =
gameManagerMap[runner].getGameInfo(appName)
const envVars = setupWineEnvVars(gameSettings, installFolderName)
Expand Down

0 comments on commit 492aec0

Please sign in to comment.