Skip to content

Commit 8207190

Browse files
[UI] disable DXVK-NVAPI when DXVK is disabled (#4842)
feat: disable DXVK-NVAPI when DXVK is disabled
1 parent e904ecd commit 8207190

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/frontend/screens/Settings/components/AutoDXVK.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const AutoDXVK = () => {
1616
const { platform } = useContext(ContextProvider)
1717
const isLinux = platform === 'linux'
1818
const [autoInstallVkd3d] = useSetting('autoInstallVkd3d', false)
19+
const [autoInstallDxvkNvapi] = useSetting('autoInstallDxvkNvapi', false)
1920
const [wineVersion] = useSetting('wineVersion', defaultWineVersion)
2021
const { appName } = useContext(SettingsContext)
2122
const [installingDxvk, setInstallingDxvk] = React.useState(false)
@@ -50,7 +51,10 @@ const AutoDXVK = () => {
5051
: t('setting.autodxvk', 'Auto Install/Update DXVK on Prefix')
5152
}
5253
fading={installingDxvk}
53-
disabled={installingDxvk || (isLinux && autoInstallVkd3d)}
54+
disabled={
55+
installingDxvk ||
56+
(isLinux && (autoInstallDxvkNvapi || autoInstallVkd3d))
57+
}
5458
/>
5559

5660
<InfoIcon

src/frontend/screens/Settings/components/AutoDXVKNVAPI.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import InfoIcon from 'frontend/components/UI/InfoIcon'
88

99
const AutoDXVKNVAPI = () => {
1010
const { t } = useTranslation()
11+
const [autoInstallDxvk] = useSetting('autoInstallDxvk', false)
1112
const [autoInstallDXVKNVAPI, setAutoInstallDXVKNVAPI] = useSetting(
1213
'autoInstallDxvkNvapi',
1314
false
@@ -50,7 +51,7 @@ const AutoDXVKNVAPI = () => {
5051
)
5152
}
5253
fading={installingDxvkNvapi}
53-
disabled={installingDxvkNvapi}
54+
disabled={!autoInstallDxvk || installingDxvkNvapi}
5455
/>
5556

5657
<InfoIcon

0 commit comments

Comments
 (0)