From 620fbe8e97ed3b6ed4c4dadc97e75e3b40f8ebd0 Mon Sep 17 00:00:00 2001 From: Dummerle <44114474+Dummerle@users.noreply.github.com> Date: Sat, 18 Dec 2021 23:24:20 +0100 Subject: [PATCH] Always download Windows assets --- rare/components/dialogs/launch_dialog.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rare/components/dialogs/launch_dialog.py b/rare/components/dialogs/launch_dialog.py index dbd8cd11..cc60723e 100644 --- a/rare/components/dialogs/launch_dialog.py +++ b/rare/components/dialogs/launch_dialog.py @@ -1,4 +1,5 @@ import os +import platform from logging import getLogger from PyQt5.QtCore import Qt, pyqtSignal, QRunnable, QObject, QThreadPool @@ -61,17 +62,20 @@ class AssetWorker(QRunnable): self.assets = dict() def run(self) -> None: - for platform in shared.core.get_installed_platforms(): - self.assets.update({platform: self.get_asset(platform)}) + platforms = list(set(shared.core.get_installed_platforms() + ["Windows"])) + if platform.system() == "Darwin" and "Mac" not in platforms: + platforms.append("Mac") + for p in platforms: + self.assets.update({p: self.get_asset(p)}) self.signals.result.emit(self.assets, "assets") @staticmethod - def get_asset(platform): + def get_asset(p): if not shared.core.egs.user: return [] assets = [ GameAsset.from_egs_json(a) for a in - shared.core.egs.get_game_assets(platform=platform) + shared.core.egs.get_game_assets(platform=p) ] return assets