CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-06-03 03:04:42 +12:00
Code Issues Projects Releases Wiki Activity

Fix question, if no save path exists and move env vars to default game settings

Browse source
This commit is contained in:
Dummerle 2022-03-22 20:40:23 +01:00
parent 44e0bbb14a
commit a98ffb766e
No known key found for this signature in database
GPG key ID: AB68CC59CA39F2F1
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,6 @@ from PyQt5.QtWidgets import QSizePolicy, QPushButton, QLabel, QFileDialog, QMess
from legendary.models.game import Game, InstalledGame
from rare.components.tabs.settings import DefaultGameSettings
from rare.components.tabs.settings.widgets.env_vars import EnvVars
from rare.components.tabs.settings.widgets.pre_launch import PreLaunchSettings
from rare.utils import config_helper
from rare.utils.extra_widgets import PathEdit
@ -68,9 +67,6 @@ class GameSettings(DefaultGameSettings):
lambda active: self.wrapper_settings.add_wrapper("mangohud")
if active else self.wrapper_settings.delete_wrapper("mangohud"))
self.env_vars = EnvVars(self)
self.game_settings_layout.addWidget(self.env_vars)
def compute_save_path(self):
if (
self.core.is_installed(self.game.app_name)

1
rare/components/tabs/games/game_utils.py
View file

@ -97,6 +97,7 @@ class GameUtils(QObject):
except ValueError:
logger.info("Cancel startup")
self.sync_finished(app_name)
return
except AssertionError:
dont_sync_after_finish = True
else:

5
rare/components/tabs/settings/default_game_settings.py
View file

@ -7,6 +7,7 @@ from PyQt5.QtWidgets import (
QLabel
)
from rare.components.tabs.settings.widgets.env_vars import EnvVars
from rare.components.tabs.settings.widgets.linux import LinuxSettings
from rare.components.tabs.settings.widgets.proton import ProtonSettings
from rare.components.tabs.settings.widgets.wrapper import WrapperSettings
@ -63,6 +64,9 @@ class DefaultGameSettings(QWidget, Ui_GameSettings):
else:
self.linux_settings_widget.setVisible(False)
self.env_vars = EnvVars(self)
self.game_settings_layout.addWidget(self.env_vars)
if is_default:
for i in range(4): # remove some entries which are not supported by default
self.launch_settings_layout.removeRow(0)
@ -106,6 +110,7 @@ class DefaultGameSettings(QWidget, Ui_GameSettings):
else:
self.linux_settings.wine_groupbox.setEnabled(True)
self.wrapper_settings.load_settings(app_name)
self.env_vars.update_game(app_name)
class LinuxAppSettings(LinuxSettings):