From 98a2a3b8195bb53bb93be8dcf95d830ee2dec7fc Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Thu, 17 Sep 2020 13:57:45 -0500 Subject: [PATCH] proton: Respect WINEDLLOVERRIDES from user_settings, too --- proton | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proton b/proton index 14edef87..1e38a9e9 100755 --- a/proton +++ b/proton @@ -405,7 +405,7 @@ class CompatData: steamdir = os.environ["HOME"] + ".steam/root/" use_wined3d = "wined3d" in g_session.compat_config - use_dxvk_dxgi = "WINEDLLOVERRIDES" in os.environ and "dxgi=n" in os.environ["WINEDLLOVERRIDES"] + use_dxvk_dxgi = "WINEDLLOVERRIDES" in g_session.env and "dxgi=n" in g_session.env["WINEDLLOVERRIDES"] builtin_dll_copy = os.environ.get("PROTON_DLL_COPY", #dxsetup redist @@ -737,8 +737,8 @@ class Session: s = s + ";" + dll + "=" + setting else: s = dll + "=" + setting - if "WINEDLLOVERRIDES" in os.environ: - self.env["WINEDLLOVERRIDES"] = os.environ["WINEDLLOVERRIDES"] + ";" + s + if "WINEDLLOVERRIDES" in self.env: + self.env["WINEDLLOVERRIDES"] = self.env["WINEDLLOVERRIDES"] + ";" + s else: self.env["WINEDLLOVERRIDES"] = s