Disable winemenubuilder by default in the DLL overrides

This commit is contained in:
Mathieu Comandon 2021-09-17 21:41:36 -07:00
parent f07208fff2
commit 9c5ab57ab6
2 changed files with 5 additions and 6 deletions

View file

@ -389,10 +389,7 @@ class CommandsMixin:
or self.installer.script.get("game", {}).get("arch") \
or WINE_DEFAULT_ARCH
if task_name == "wineexec":
data["env"] = self.script_env or {}
data["env"]["WINEDLLOVERRIDES"] = (
"winemenubuilder=d;" + data["env"].get("WINEDLLOVERRIDES", "")
).strip(";")
data["env"] = self.script_env
for key in data:
value = data[key]

View file

@ -419,8 +419,10 @@ def get_overrides_env(overrides):
Output a string of dll overrides usable with WINEDLLOVERRIDES
See: https://wiki.winehq.org/Wine_User%27s_Guide#WINEDLLOVERRIDES.3DDLL_Overrides
"""
if not overrides:
return ""
default_overrides = {
"winemenubuilder": ""
}
overrides.update(default_overrides)
override_buckets = OrderedDict([("n,b", []), ("b,n", []), ("b", []), ("n", []), ("d", []), ("", [])])
for dll, value in overrides.items():
if not value: