mirrors/an-anime-game-launcher
1
0
Fork 0
mirror of https://github.com/an-anime-team/an-anime-game-launcher.git synced 2025-02-26 12:21:05 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: fixed "wine not installed" button work

Browse source
This commit is contained in:
Observer KRypt0n_ 2023-03-16 14:27:53 +02:00
parent b2ff2c585d
commit 59d0e27ca3
No known key found for this signature in database
GPG key ID: 844DA47BA25FE1E2
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/ui/main.rs
View file

@ -1097,17 +1097,34 @@ impl SimpleComponent for App {
let mut config = config::get().unwrap(); let mut config = config::get().unwrap();
match wine::get_downloaded(&CONFIG.components.path, &config.game.wine.builds) { match wine::get_downloaded(&CONFIG.components.path, &config.game.wine.builds) {
Ok(list) => { Ok(downloaded) => {
// FIXME: .find(|version| version.recommended) // Select downloaded version
if !list.is_empty() { if !downloaded.is_empty() {
config.game.wine.selected = Some(list[0].name.clone()); config.game.wine.selected = Some(downloaded[0].name.clone());
config::update(config.clone()); config::update(config.clone());
sender.input(AppMsg::UpdateLauncherState {
perform_on_download_needed: false,
show_status_page: true
});
} }
if config.game.wine.selected.is_none() { // Or download new one if none is available
let wine = wine::Version::latest(&CONFIG.components.path).expect("Failed to get latest wine version"); else {
let latest = wine::Version::latest(&CONFIG.components.path).expect("Failed to get latest wine version");
// Choose selected wine version or use latest available one
let wine = match &config.game.wine.selected {
Some(version) => match wine::Version::find_in(&config.components.path, version) {
Ok(Some(version)) => version,
_ => latest
}
None => latest
};
// Download wine version
match Installer::new(wine.uri) { match Installer::new(wine.uri) {
Ok(mut installer) => { Ok(mut installer) => {
if let Some(temp_folder) = &config.launcher.temp { if let Some(temp_folder) = &config.launcher.temp {
@ -1165,13 +1182,6 @@ impl SimpleComponent for App {
Err(err) => self.toast(tr("wine-install-failed"), Some(err.to_string())) Err(err) => self.toast(tr("wine-install-failed"), Some(err.to_string()))
} }
} }
else {
sender.input(AppMsg::UpdateLauncherState {
perform_on_download_needed: false,
show_status_page: true
});
}
} }
Err(err) => self.toast(tr("downloaded-wine-list-failed"), Some(err.to_string())) Err(err) => self.toast(tr("downloaded-wine-list-failed"), Some(err.to_string()))