From 907cf31182fa578c69f04ea8b63d7bfb22c134b9 Mon Sep 17 00:00:00 2001 From: Henrique Cavarsan Date: Fri, 21 Jun 2024 10:35:22 -0300 Subject: [PATCH] fix: fix dialog message --- crates/kftray-tauri/src/utils/validate_configs.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/kftray-tauri/src/utils/validate_configs.rs b/crates/kftray-tauri/src/utils/validate_configs.rs index 7d117c47..edaad45d 100644 --- a/crates/kftray-tauri/src/utils/validate_configs.rs +++ b/crates/kftray-tauri/src/utils/validate_configs.rs @@ -85,21 +85,21 @@ async fn show_alert_dialog( let full_message = format!( "Multiple configuration directories have been detected in the following locations:\n\n{}\n\n\ - {}\n\ Environment Variables Checked (in order of precedence):\n\ - - XDG_CONFIG_HOME: {}\n\ - KFTRAY_CONFIG: {}\n\ + - XDG_CONFIG_HOME: {}\n\ - HOME: {}\n\n\ + {}\ To resolve this issue, please:\n\ 1. Move or delete the extra configuration directories.\n\ 2. Ensure that the remaining directory is in the correct location.\n\n\ Recommended Directory:\n\ * {}\n", msg, - active_config_msg, - env::var("XDG_CONFIG_HOME").unwrap_or_else(|_| "Not set".to_string()), env::var("KFTRAY_CONFIG").unwrap_or_else(|_| "Not set".to_string()), + env::var("XDG_CONFIG_HOME").unwrap_or_else(|_| "Not set".to_string()), env::var("HOME").unwrap_or_else(|_| "Not set".to_string()), + active_config_msg, dirs::home_dir().map_or("".to_string(), |p| p.join(".kftray").display().to_string()) );