From e21dddd2a36af012089442a0ef9e8e7c7ae0dba8 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 8 Mar 2023 18:37:16 +0200 Subject: [PATCH] feat(core): implemented SDK 0.5.0 --- Cargo.lock | 2 +- anime-launcher-sdk | 2 +- src/ui/first_run/download_components.rs | 2 +- src/ui/preferences/general.rs | 8 +++++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 87cac65..5411421 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "anime-launcher-sdk" -version = "0.4.0" +version = "0.5.0" dependencies = [ "anime-game-core", "anyhow", diff --git a/anime-launcher-sdk b/anime-launcher-sdk index d64d15c..ba11109 160000 --- a/anime-launcher-sdk +++ b/anime-launcher-sdk @@ -1 +1 @@ -Subproject commit d64d15cf272a7235cca7e727faadf775ceef5278 +Subproject commit ba1110908259fa893036f9b37ffef2576d0c2f92 diff --git a/src/ui/first_run/download_components.rs b/src/ui/first_run/download_components.rs index c9c9fc0..6f42510 100644 --- a/src/ui/first_run/download_components.rs +++ b/src/ui/first_run/download_components.rs @@ -529,7 +529,7 @@ impl SimpleAsyncComponent for DownloadComponentsApp { let group = wine.find_group(&config.components.path).unwrap().unwrap(); // Apply DXVK if we need it - if group.features.need_dxvk { + if wine.features.as_ref().unwrap_or(&group.features).need_dxvk { let wine = wine .to_wine(Some(config.game.wine.builds.join(&wine.name))) .with_loader(WineLoader::Current) diff --git a/src/ui/preferences/general.rs b/src/ui/preferences/general.rs index 7506403..fa497af 100644 --- a/src/ui/preferences/general.rs +++ b/src/ui/preferences/general.rs @@ -765,7 +765,13 @@ impl SimpleAsyncComponent for GeneralApp { self.downloaded_wine_versions = wine::get_downloaded(&CONFIG.components.path, &CONFIG.game.wine.builds) .unwrap_or_default() .into_iter() - .flat_map(|group| group.versions.into_iter().map(move |version| (version, group.features.clone()))) + .flat_map(|group| group.versions + .into_iter() + .map(move |version| ( + version.clone(), + version.features.unwrap_or_else(|| group.features.clone())) + ) + ) .collect(); self.selected_wine_version = if let Some(selected) = &CONFIG.game.wine.selected {