1
0
mirror of https://github.com/lutris/lutris synced 2024-06-29 05:34:25 +00:00

Re-arrange code and add a hack so that wineexec() will work with GE-Proton (Latest)

It needs to recognize that oddball "path" that is not a path, and in that case substitute the proper UMU script and *not* set PROTONPATH, since we don't know what that is. Seems to work, still super ugly though.

Resolves #5519
This commit is contained in:
Daniel Johnson 2024-06-18 16:58:33 -04:00
parent 350305cf86
commit 98f53221f3

View File

@ -338,7 +338,11 @@ def wineexec(
if proton.is_proton_path(wine_path):
game = None
wineenv["GAMEID"] = proton.get_game_id(game)
wineenv["PROTONPATH"] = proton.get_proton_path_from_bin(wine_path)
if wine_path == GE_PROTON_LATEST:
wine_path = proton.get_umu_path()
else:
wineenv["PROTONPATH"] = proton.get_proton_path_from_bin(wine_path)
locale = env.get("LC_ALL")
host_locale = env.get("HOST_LC_ALL")
if locale and not host_locale:
@ -348,9 +352,6 @@ def wineexec(
baseenv.update(wineenv)
baseenv.update(env)
if proton.is_proton_path(wine_path):
wine_path = proton.get_umu_path()
command_parameters = [wine_path]
if executable:
command_parameters.append(executable)