From 065afac87f70c23d0210d40314ab4d73763a9c2e Mon Sep 17 00:00:00 2001
From: R1kaB3rN <100738684+R1kaB3rN@users.noreply.github.com>
Date: Wed, 3 Apr 2024 19:50:26 -0700
Subject: [PATCH] Kill wineserver via UMU Proton

- Kills the wineserver process associated with the running prefix via the `wineserver` command in the UMU-Proton directory instead of wineboot which had lead to unreliable results
---
 lutris/runners/commands/wine.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lutris/runners/commands/wine.py b/lutris/runners/commands/wine.py
index 0e4f56342..f83a4ada9 100644
--- a/lutris/runners/commands/wine.py
+++ b/lutris/runners/commands/wine.py
@@ -178,11 +178,14 @@ def winekill(prefix, arch=WINE_DEFAULT_ARCH, wine_path=None, env=None, initial_p
     """Kill processes in Wine prefix."""
 
     initial_pids = initial_pids or []
+    steam_data_dir = os.path.expanduser("~/.local/share/Steam/compatibilitytools.d")
     if not env:
         env = {"WINEARCH": arch, "WINEPREFIX": prefix}
-    if proton.is_proton_path(wine_path):
-        command = [proton.get_umu_path(), "runinprefix", "wineboot", "-e"]
+    if proton.is_proton_path(wine_path) and os.path.exists(f"{steam_data_dir}/UMU-Latest"):
+        proton_version = os.path.realpath(f"{steam_data_dir}/UMU-Latest")
+        command = [os.path.join(proton_version, "files", "bin", "wineserver"), "-k"]
         env["GAMEID"] = proton.DEFAULT_GAMEID
+        env["WINEPREFIX"] = prefix
     else:
         if not wine_path:
             if not runner: