Don't enable Steam Runtime when switching to wine-ge-proton (#2593)

bottlesdevs · Feb 20, 2023 · 5dbaf44 · 5dbaf44
1 parent aa85dd5
commit 5dbaf44
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/bottles/backend/managers/manager.py b/bottles/backend/managers/manager.py
@@ -352,17 +352,16 @@ def check_runners(self, install_latest: bool = True) -> bool:
 
         # lock winemenubuilder.exe
         for runner in runners:
-            winemenubuilder_paths = [
-                f"{runner}lib64/wine/x86_64-windows/winemenubuilder.exe",
-                f"{runner}lib/wine/x86_64-windows/winemenubuilder.exe",
-                f"{runner}lib32/wine/i386-windows/winemenubuilder.exe",
-                f"{runner}lib/wine/i386-windows/winemenubuilder.exe",
-            ]
-            for winemenubuilder in winemenubuilder_paths:
-                if winemenubuilder.startswith("Proton"):
-                    continue
-                if os.path.isfile(winemenubuilder):
-                    os.rename(winemenubuilder, f"{winemenubuilder}.lock")
+            if runner not in self.supported_proton_runners:
+                winemenubuilder_paths = [
+                    f"{runner}lib64/wine/x86_64-windows/winemenubuilder.exe",
+                    f"{runner}lib/wine/x86_64-windows/winemenubuilder.exe",
+                    f"{runner}lib32/wine/i386-windows/winemenubuilder.exe",
+                    f"{runner}lib/wine/i386-windows/winemenubuilder.exe",
+                ]
+                for winemenubuilder in winemenubuilder_paths:
+                    if os.path.isfile(winemenubuilder):
+                        os.rename(winemenubuilder, f"{winemenubuilder}.lock")
 
         # check system wine
         if shutil.which("wine") is not None:

diff --git a/bottles/backend/runner.py b/bottles/backend/runner.py
@@ -89,7 +89,7 @@ def runner_update(config: BottleConfig, manager: 'Manager', runner: str) -> Resu
         the host system. There are some exceptions, like the Soda and Wine-GE runners,
         which are built to work without the Steam Runtime.
         """
-        if "proton" in runner.lower() and RuntimeManager.get_runtimes("steam"):
+        if runner in manager.supported_proton_runners and RuntimeManager.get_runtimes("steam"):
             manager.update_config(config, "use_steam_runtime", True, "Parameters")
 
         return Result(