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-27 04:40:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed DXVK applying using system wine

Browse source
This commit is contained in:
Observer KRypt0n_ 2022-09-14 14:05:44 +02:00
parent 8efd07c7fd
commit afafd6bbd1
No known key found for this signature in database
GPG key ID: 844DA47BA25FE1E2
1 changed files with 49 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/lib/dxvk.rs
View file

@ -83,12 +83,17 @@ impl Version {
let apply_path = format!("{}/{}/setup_dxvk.sh", dxvks_folder.to_string(), self.name); let apply_path = format!("{}/{}/setup_dxvk.sh", dxvks_folder.to_string(), self.name);
let config = config::get()?; let config = config::get()?;
match config.try_get_selected_wine_info() { let (wine_path, wineserver_path, wineboot_path) = match config.try_get_selected_wine_info() {
Some(wine) => { Some(wine) => {
let wine_path = format!("{}/{}/{}", &config.game.wine.builds, wine.name, wine.files.wine64); let wine_path = format!("{}/{}/{}", &config.game.wine.builds, wine.name, wine.files.wine64);
let wineserver_path = format!("{}/{}/{}", &config.game.wine.builds, wine.name, wine.files.wineserver); let wineserver_path = format!("{}/{}/{}", &config.game.wine.builds, wine.name, wine.files.wineserver);
let wineboot_path = format!("{}/{}/{}", &config.game.wine.builds, wine.name, wine.files.wineboot); let wineboot_path = format!("{}/{}/{}", &config.game.wine.builds, wine.name, wine.files.wineboot);
(wine_path, wineserver_path, wineboot_path)
},
None => (String::from("wine64"), String::from("wineserver"), String::from("wineboot"))
};
let mut apply_script = std::fs::read_to_string(&apply_path)?; let mut apply_script = std::fs::read_to_string(&apply_path)?;
lazy_static! { lazy_static! {
@ -134,8 +139,5 @@ impl Version {
else { else {
Err(Error::new(ErrorKind::Other, String::from_utf8_lossy(&output.stderr))) Err(Error::new(ErrorKind::Other, String::from_utf8_lossy(&output.stderr)))
} }
},
None => Err(Error::new(ErrorKind::Other, "Wine is not selected"))
}
} }
} }