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.

Sign up for GitHub

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

Jump to bottom

[General] Fix option check for update on startup #980

Merged
merged 10 commits into from
Feb 23, 2022
Merged

[General] Fix option check for update on startup #980

Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
85e3114
Fixed option check for update on startup
Nocccer Feb 17, 2022
e402830
Fixed review suggestion
Nocccer Feb 17, 2022
a63c4d4
Merge branch 'main' into fix_option_update_notification
Nocccer Feb 17, 2022
fc9cc1d
Removed all unessecary || (or)
Nocccer Feb 17, 2022
1f47d36
Merge branch 'fix_option_update_notification' of https://github.com/H…
Nocccer Feb 17, 2022
f78fb37
lint fix
Nocccer Feb 17, 2022
2dc9264
Merge branch 'main' into fix_option_update_notification
Nocccer Feb 21, 2022
2df27e7
Merge branch 'main' into fix_option_update_notification
Nocccer Feb 23, 2022
353e1f6
Merge branch 'main' into fix_option_update_notification
Nocccer Feb 23, 2022
1786077
Merge branch 'main' into fix_option_update_notification
Nocccer Feb 23, 2022
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
48 changes: 26 additions & 22 deletions src/screens/Settings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function Settings() {
on: checkForUpdatesOnStartup,
toggle: toggleCheckForUpdatesOnStartup,
setOn: setCheckForUpdatesOnStartup
} = useToggle(false)
} = useToggle(true)
const {
on: nvidiaPrime,
toggle: toggleNvidiaPrime,
Expand Down Expand Up @@ -194,43 +194,47 @@ function Settings() {
'requestSettings',
appName
)
setAutoSyncSaves(config.autoSyncSaves || false)
setUseGameMode(config.useGameMode || false)
setShowFps(config.showFps || false)
setShowOffline(config.offlineMode || false)
setAudioFix(config.audioFix || false)
setShowMangoHud(config.showMangohud || false)
setAutoSyncSaves(config.autoSyncSaves)
setUseGameMode(config.useGameMode)
setShowFps(config.showFps)
setShowOffline(config.offlineMode)
setAudioFix(config.audioFix)
setShowMangoHud(config.showMangohud)
setDefaultInstallPath(config.defaultInstallPath)
setWineVersion(config.wineVersion)
setWinePrefix(config.winePrefix)
setWineCrossoverBottle(config.wineCrossoverBottle)
setOtherOptions(config.otherOptions)
setLauncherArgs(config.launcherArgs)
setUseNvidiaPrime(config.nvidiaPrime || false)
setUseNvidiaPrime(config.nvidiaPrime)
setEgsLinkedPath(config.egsLinkedPath || '')
setEgsPath(config.egsLinkedPath || '')
setExitToTray(config.exitToTray || false)
setStartInTray(config.startInTray || false)
setDarkTrayIcon(config.darkTrayIcon || false)
setDiscordRPC(config.discordRPC || false)
setAutoInstallDxvk(config.autoInstallDxvk || false)
setAutoInstallVkd3d(config.autoInstallVkd3d || false)
setEnableEsync(config.enableEsync || false)
setEnableFsync(config.enableFsync || false)
setEnableFSR(config.enableFSR || false)
setExitToTray(config.exitToTray)
setStartInTray(config.startInTray)
setDarkTrayIcon(config.darkTrayIcon)
setDiscordRPC(config.discordRPC)
setAutoInstallDxvk(config.autoInstallDxvk)
setAutoInstallVkd3d(config.autoInstallVkd3d)
setEnableEsync(config.enableEsync)
flavioislima marked this conversation as resolved.
Show resolved Hide resolved
setEnableFsync(config.enableFsync)
setEnableFSR(config.enableFSR)
setFsrSharpness(config.maxSharpness || 2)
setResizableBar(config.enableResizableBar || false)
setResizableBar(config.enableResizableBar)
setSavesPath(config.savesPath || '')
setMaxWorkers(config.maxWorkers ?? 0)
setMaxRecentGames(config.maxRecentGames ?? 5)
setCustomWinePaths(config.customWinePaths || [])
setAddDesktopShortcuts(config.addDesktopShortcuts || false)
setAddGamesToStartMenu(config.addStartMenuShortcuts || false)
setAddDesktopShortcuts(config.addDesktopShortcuts)
setAddGamesToStartMenu(config.addStartMenuShortcuts)
setCustomWinePaths(config.customWinePaths || [])
setCheckForUpdatesOnStartup(config.checkForUpdatesOnStartup || true)
setCheckForUpdatesOnStartup(
Nocccer marked this conversation as resolved.
Show resolved Hide resolved
config.checkForUpdatesOnStartup !== undefined
? config.checkForUpdatesOnStartup
: true
)
setTargetExe(config.targetExe || '')
setAltLegendaryBin(config.altLegendaryBin || '')
setShowUnrealMarket(config.showUnrealMarket || false)
setShowUnrealMarket(config.showUnrealMarket)
setDefaultWinePrefix(config.defaultWinePrefix)

if (!isDefault) {
Expand Down