From 362f1a72abb274f0e431c41475fd388d07c880ae Mon Sep 17 00:00:00 2001 From: Krzysztof Saczuk Date: Sun, 30 Jun 2024 14:25:36 +0200 Subject: [PATCH] fix: wrong wine prefix for proton --- src/games/genshin/game.rs | 8 ++++---- src/games/honkai/game.rs | 8 ++++---- src/games/pgr/game.rs | 8 ++++---- src/games/star_rail/game.rs | 8 ++++---- src/games/wuwa/game.rs | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/games/genshin/game.rs b/src/games/genshin/game.rs index ce6b5ca..e1d0084 100644 --- a/src/games/genshin/game.rs +++ b/src/games/genshin/game.rs @@ -132,13 +132,13 @@ pub fn run() -> anyhow::Result<()> { } // Prepare wine prefix drives - - config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?; + let prefix_folder = config.get_wine_prefix_path(); + config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?; // Workaround for sandboxing feature if config.sandbox.enabled { - WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?; - WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?; + WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?; + WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?; } // Prepare bash -c '' diff --git a/src/games/honkai/game.rs b/src/games/honkai/game.rs index 8a93ace..c771572 100644 --- a/src/games/honkai/game.rs +++ b/src/games/honkai/game.rs @@ -80,13 +80,13 @@ pub fn run() -> anyhow::Result<()> { } // Prepare wine prefix drives - - config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?; + let prefix_folder = config.get_wine_prefix_path(); + config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?; // Workaround for sandboxing feature if config.sandbox.enabled { - WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?; - WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?; + WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?; + WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?; } // Prepare bash -c '' diff --git a/src/games/pgr/game.rs b/src/games/pgr/game.rs index 8972123..e1ea88a 100644 --- a/src/games/pgr/game.rs +++ b/src/games/pgr/game.rs @@ -76,13 +76,13 @@ pub fn run() -> anyhow::Result<()> { } // Prepare wine prefix drives - - config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?; + let prefix_folder = config.get_wine_prefix_path(); + config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?; // Workaround for sandboxing feature if config.sandbox.enabled { - WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?; - WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?; + WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?; + WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?; } // Prepare bash -c '' diff --git a/src/games/star_rail/game.rs b/src/games/star_rail/game.rs index 6cfc000..4fe47b9 100644 --- a/src/games/star_rail/game.rs +++ b/src/games/star_rail/game.rs @@ -80,15 +80,15 @@ pub fn run() -> anyhow::Result<()> { } // Prepare wine prefix drives - - config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?; + let prefix_folder = config.get_wine_prefix_path(); + config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?; // Workaround for the jadeite patch (we run it from Z: drive) - WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?; + WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?; // Workaround for sandboxing feature if config.sandbox.enabled { - WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?; + WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?; } // Prepare bash -c '' diff --git a/src/games/wuwa/game.rs b/src/games/wuwa/game.rs index 077bece..b34abd8 100644 --- a/src/games/wuwa/game.rs +++ b/src/games/wuwa/game.rs @@ -70,13 +70,13 @@ pub fn run() -> anyhow::Result<()> { } // Prepare wine prefix drives - - config.game.wine.drives.map_folders(&folders.game, &folders.prefix)?; + let prefix_folder = config.get_wine_prefix_path(); + config.game.wine.drives.map_folders(&folders.game, &prefix_folder)?; // Workaround for sandboxing feature if config.sandbox.enabled { - WineDrives::map_folder(&folders.prefix, AllowedDrives::C, "../drive_c")?; - WineDrives::map_folder(&folders.prefix, AllowedDrives::Z, "/")?; + WineDrives::map_folder(&prefix_folder, AllowedDrives::C, "../drive_c")?; + WineDrives::map_folder(&prefix_folder, AllowedDrives::Z, "/")?; } // Prepare bash -c ''