Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-01-27 22:18:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

proton: Don't override the environment with user_settings

Browse Source 
The intended priority orider is command-line options (the environment)
beats user_settings beats compat_config settings beats defaults.
This commit is contained in:
Andrew Eikum 2019-07-31 07:59:37 -05:00
parent 685f119488
commit a6c0e8b2ff
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
proton
View File

@ -127,6 +127,7 @@ class Proton:
if not os.path.isdir(self.default_pfx_dir): if not os.path.isdir(self.default_pfx_dir):
#make default prefix #make default prefix
local_env["WINEPREFIX"] = self.default_pfx_dir local_env["WINEPREFIX"] = self.default_pfx_dir
local_env["WINEDEBUG"] = "-all"
g_session.run_proc([self.wine_bin, "wineboot"], local_env) g_session.run_proc([self.wine_bin, "wineboot"], local_env)
g_session.run_proc([self.wineserver_bin, "-w"], local_env) g_session.run_proc([self.wineserver_bin, "-w"], local_env)
@ -423,9 +424,6 @@ class Session:
else: else:
self.env.pop("LC_ALL", "") self.env.pop("LC_ALL", "")
#for performance, logging is disabled by default; override with user_settings.py
self.env["DXVK_LOG_LEVEL"] = "none"
self.env["WINEDEBUG"] = "-all"
self.env.pop("WINEARCH", "") self.env.pop("WINEARCH", "")
if ld_path_var in os.environ: if ld_path_var in os.environ:
@ -452,25 +450,30 @@ class Session:
def init_session(self): def init_session(self):
self.env["WINEPREFIX"] = g_compatdata.prefix_dir self.env["WINEPREFIX"] = g_compatdata.prefix_dir
if "PROTON_LOG" in self.env and nonzero(self.env["PROTON_LOG"]):
self.env["WINEDEBUG"] = "+timestamp,+pid,+tid,+seh,+debugstr,+loaddll,+mscoree"
self.env["DXVK_LOG_LEVEL"] = "info"
self.env["WINE_MONO_TRACE"] = "E:System.NotImplementedException"
#default wine-mono override for FNA games
self.env["WINE_MONO_OVERRIDES"] = "Microsoft.Xna.Framework.*,Gac=n"
#load environment overrides #load environment overrides
if os.path.exists(g_proton.user_settings_file): if os.path.exists(g_proton.user_settings_file):
try: try:
import user_settings import user_settings
self.env.update(user_settings.user_settings) for key, value in user_settings.user_settings.items():
self.env.setdefault(key, value)
except: except:
log("************************************************") log("************************************************")
log("THERE IS AN ERROR IN YOUR user_settings.py FILE:") log("THERE IS AN ERROR IN YOUR user_settings.py FILE:")
log("%s" % sys.exc_info()[1]) log("%s" % sys.exc_info()[1])
log("************************************************") log("************************************************")
if "PROTON_LOG" in self.env and nonzero(self.env["PROTON_LOG"]):
self.env.setdefault("WINEDEBUG", "+timestamp,+pid,+tid,+seh,+debugstr,+loaddll,+mscoree")
self.env.setdefault("DXVK_LOG_LEVEL", "info")
self.env.setdefault("WINE_MONO_TRACE", "E:System.NotImplementedException")
#for performance, logging is disabled by default; override with user_settings.py
self.env.setdefault("WINEDEBUG", "-all")
self.env.setdefault("DXVK_LOG_LEVEL", "none")
#default wine-mono override for FNA games
self.env.setdefault("WINE_MONO_OVERRIDES", "Microsoft.Xna.Framework.*,Gac=n")
if "wined3d11" in self.compat_config: if "wined3d11" in self.compat_config:
self.compat_config.add("wined3d") self.compat_config.add("wined3d")