diff --git a/rare/components/main_window.py b/rare/components/main_window.py index da94a983..1efd4f66 100644 --- a/rare/components/main_window.py +++ b/rare/components/main_window.py @@ -215,7 +215,7 @@ class MainWindow(QMainWindow): # lk: `accept_close` is set to `True` by the `close()` method, overrides exiting to tray in `closeEvent()` # lk: ensures exiting instead of hiding when `close()` is called programmatically if not self.__accept_close: - if self.settings.value("sys_tray", False, bool): + if self.settings.value("sys_tray", True, bool): self.hide() e.ignore() return diff --git a/rare/components/tabs/games/game_info/cloud_saves.py b/rare/components/tabs/games/game_info/cloud_saves.py index 6381904c..a39d492b 100644 --- a/rare/components/tabs/games/game_info/cloud_saves.py +++ b/rare/components/tabs/games/game_info/cloud_saves.py @@ -117,6 +117,7 @@ class CloudSaves(QWidget, SideTabContents): logger.warning(str(e)) resolver = WineResolver(self.core, self.rgame.raw_save_path, self.rgame.app_name) if not resolver.wine_env.get("WINEPREFIX"): + del resolver self.cloud_save_path_edit.setText("") QMessageBox.warning(self, "Warning", "No wine prefix selected. Please set it in settings") return @@ -145,7 +146,7 @@ class CloudSaves(QWidget, SideTabContents): self, self.tr("Error - {}").format(self.rgame.title), self.tr( - "Error while calculating path for {}. Insufficient permisions to create {}" + "Error while calculating path for {}. Insufficient permissions to create {}" ).format(self.rgame.title, path), ) return @@ -205,7 +206,10 @@ class CloudSaves(QWidget, SideTabContents): self.cloud_ui.cloud_sync.blockSignals(True) self.cloud_ui.cloud_sync.setChecked(self.rgame.auto_sync_saves) self.cloud_ui.cloud_sync.blockSignals(False) + self.cloud_save_path_edit.setText(self.rgame.save_path if self.rgame.save_path else "") + if platform.system() == "Windows" and not self.rgame.save_path: + self.compute_save_path() def update_game(self, rgame: RareGame): if self.rgame: diff --git a/rare/components/tabs/settings/widgets/linux.py b/rare/components/tabs/settings/widgets/linux.py index 7df32196..b3a322bd 100644 --- a/rare/components/tabs/settings/widgets/linux.py +++ b/rare/components/tabs/settings/widgets/linux.py @@ -61,7 +61,6 @@ class LinuxSettings(QWidget): self.ui.linux_layout.addWidget(self.mangohud) self.mangohud.load_settings(self.name) - def load_prefix(self) -> str: return self.load_setting( f"{self.name}.env",