From c7cf8ab32421b86089535fcffd13ba45d6444b0f 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 (cherry picked from commit 98a2a3b8195bb53bb93be8dcf95d830ee2dec7fc) --- proton | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/proton b/proton index 81838204..a2fbb879 100755 --- a/proton +++ b/proton @@ -355,7 +355,7 @@ class CompatData: wined3dfiles = [] #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") else: wined3dfiles.append("dxgi") @@ -554,8 +554,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