From e804712aa0dfcc0f544fd14b918470a6f3a67466 Mon Sep 17 00:00:00 2001 From: MeexReay Date: Wed, 16 Apr 2025 20:45:47 +0300 Subject: [PATCH] windows config fix --- src/config.rs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/config.rs b/src/config.rs index 181d97a..1c8caf1 100644 --- a/src/config.rs +++ b/src/config.rs @@ -115,7 +115,7 @@ pub fn load_config(path: PathBuf) -> Config { pub fn get_config_path() -> PathBuf { let mut config_dir = PathBuf::from_str(".").unwrap(); - #[cfg(feature = "homedir")] + #[cfg(all(feature = "homedir", not(target_os = "windows")))] if let Some(dir) = { let home_dir = { use homedir::my_home; @@ -134,17 +134,20 @@ pub fn get_config_path() -> PathBuf { home_dir.map(|o| o.join(".config")) }; - #[cfg(target_os = "windows")] - let config_dir = { - let appdata = env::var("APPDATA").map(|o| o.join("bRAC")); - Path::new(&appdata) - }; - config_dir } { config_dir = dir; } + #[cfg(target_os = "windows")] + if let Ok(dir) = { + env::var("APPDATA") + .ok() + .and_then(|o| Some(PathBuf::from_str(&o)?.join("bRAC"))) + } { + config_dir = dir; + } + config_dir.join("config.yml") }