suyu/Yucom
25
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

proton: Respect WINEDLLOVERRIDES from user_settings, too

Browse source 
(cherry picked from commit 98a2a3b819)
This commit is contained in:
Andrew Eikum 2020-09-17 13:57:45 -05:00
parent 1f43224197
commit c7cf8ab324
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
proton
View file

@ -355,7 +355,7 @@ class CompatData:
wined3dfiles = [] wined3dfiles = []
#if the user asked for dxvk's dxgi (dxgi=n), then copy it into place #if the user asked for dxvk's dxgi (dxgi=n), then copy it into place
if "WINEDLLOVERRIDES" in os.environ and "dxgi=n" in os.environ["WINEDLLOVERRIDES"]: if "WINEDLLOVERRIDES" in g_session.env and "dxgi=n" in g_session.env["WINEDLLOVERRIDES"]:
dxvkfiles.append("dxgi") dxvkfiles.append("dxgi")
else: else:
wined3dfiles.append("dxgi") wined3dfiles.append("dxgi")
@ -554,8 +554,8 @@ class Session:
s = s + ";" + dll + "=" + setting s = s + ";" + dll + "=" + setting
else: else:
s = dll + "=" + setting s = dll + "=" + setting
if "WINEDLLOVERRIDES" in os.environ: if "WINEDLLOVERRIDES" in self.env:
self.env["WINEDLLOVERRIDES"] = os.environ["WINEDLLOVERRIDES"] + ";" + s self.env["WINEDLLOVERRIDES"] = self.env["WINEDLLOVERRIDES"] + ";" + s
else: else:
self.env["WINEDLLOVERRIDES"] = s self.env["WINEDLLOVERRIDES"] = s