CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-06-26 10:11:19 +12:00
Code Issues Projects Releases Wiki Activity

Add STEAM_COMPAT_CLIENT_INSTALL_PATH for proton to fix #186

Browse source
This commit is contained in:
Dummerle 2022-03-12 23:04:52 +01:00
parent 8ba7791c82
commit ebe1714f74
No known key found for this signature in database
GPG key ID: AB68CC59CA39F2F1
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rare/components/tabs/games/game_info/game_settings.py
View file

@ -1,6 +1,7 @@
import os
import platform
from logging import getLogger
from pathlib import Path
from typing import Tuple
from PyQt5.QtCore import QSettings, QThreadPool, Qt
@ -12,9 +13,9 @@ from PyQt5.QtWidgets import (
QPushButton,
QSizePolicy,
)
from legendary.core import LegendaryCore
from legendary.models.game import InstalledGame, Game
from rare.components.tabs.settings.linux import LinuxSettings
from rare.ui.components.tabs.games.game_info.game_settings import Ui_GameSettings
from rare.utils import config_helper
@ -40,7 +41,7 @@ def find_proton_wrappers():
compatibilitytool = os.path.join(c, i, "compatibilitytool.vdf")
toolmanifest = os.path.join(c, i, "toolmanifest.vdf")
if os.path.exists(proton) and (
os.path.exists(compatibilitytool) or os.path.exists(toolmanifest)
os.path.exists(compatibilitytool) or os.path.exists(toolmanifest)
):
wrapper = f'"{proton}" run'
possible_proton_wrappers.append(wrapper)
@ -135,8 +136,8 @@ class GameSettings(QWidget, Ui_GameSettings):
def compute_save_path(self):
if (
self.core.is_installed(self.game.app_name)
and self.game.supports_cloud_saves
self.core.is_installed(self.game.app_name)
and self.game.supports_cloud_saves
):
try:
new_path = self.core.get_save_path(self.game.app_name)
@ -222,6 +223,7 @@ class GameSettings(QWidget, Ui_GameSettings):
config_helper.remove_option(self.game.app_name, "wrapper")
config_helper.remove_option(self.game.app_name, "no_wine")
config_helper.remove_option(f"{self.game.app_name}.env", "STEAM_COMPAT_DATA_PATH")
config_helper.remove_option(f"{self.game.app_name}.env", "STEAM_COMPAT_CLIENT_INSTALL_PATH")
self.proton_prefix.setEnabled(False)
# lk: TODO: This has to be fixed properly.
@ -246,9 +248,15 @@ class GameSettings(QWidget, Ui_GameSettings):
"STEAM_COMPAT_DATA_PATH",
os.path.expanduser("~/.proton"),
)
config_helper.add_option(
f"{self.game.app_name}.env",
"STEAM_COMPAT_CLIENT_INSTALL_PATH",
str(Path.home().joinpath(".steam", "steam"))
)
self.proton_prefix.setText(os.path.expanduser("~/.proton"))
# Dont use Wine
# Don't use Wine
self.linux_settings.wine_exec.setText("")
self.linux_settings.wine_prefix.setText("")