Merge branch 'next' of https://github.com/an-anime-team/the-honkers-railway-launcher into next
This commit is contained in:
commit
45e260d88b
1 changed files with 8 additions and 21 deletions
|
@ -771,30 +771,17 @@ impl SimpleComponent for App {
|
||||||
|
|
||||||
tasks.push(std::thread::spawn(clone!(@strong sender => move || {
|
tasks.push(std::thread::spawn(clone!(@strong sender => move || {
|
||||||
// Get main patch status
|
// Get main patch status
|
||||||
sender.input(AppMsg::SetMainPatch(match jadeite::get_latest() {
|
sender.input(AppMsg::SetMainPatch(match jadeite::get_metadata() {
|
||||||
Ok(latest) => match jadeite::get_metadata() {
|
Ok(metadata) => {
|
||||||
Ok(metadata) => {
|
let status = GAME.get_version()
|
||||||
let status = GAME.get_version()
|
.map(|version| metadata.games.hsr.global.get_status(version))
|
||||||
.map(|version| metadata.games.hsr.global.get_status(version))
|
.unwrap_or(metadata.games.hsr.global.status);
|
||||||
.unwrap_or(metadata.games.hsr.global.status);
|
|
||||||
|
|
||||||
Some((latest.version, status))
|
Some((metadata.jadeite.version, status))
|
||||||
}
|
}
|
||||||
|
|
||||||
Err(err) => {
|
|
||||||
tracing::error!("Failed to fetch patch metadata: {err}");
|
|
||||||
|
|
||||||
sender.input(AppMsg::Toast {
|
|
||||||
title: tr("patch-info-fetching-error"),
|
|
||||||
description: Some(err.to_string())
|
|
||||||
});
|
|
||||||
|
|
||||||
None
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
tracing::error!("Failed to fetch latest patch version: {err}");
|
tracing::error!("Failed to fetch patch metadata: {err}");
|
||||||
|
|
||||||
sender.input(AppMsg::Toast {
|
sender.input(AppMsg::Toast {
|
||||||
title: tr("patch-info-fetching-error"),
|
title: tr("patch-info-fetching-error"),
|
||||||
|
|
Loading…
Reference in a new issue