From 24eb1e8b3884e69e82dafc817c741601bd1475b4 Mon Sep 17 00:00:00 2001 From: M33 <327-m33@git.qoto.org> Date: Wed, 17 Mar 2021 14:24:48 +0000 Subject: [PATCH] Update src/data.rs --- src/data.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data.rs b/src/data.rs index eda764f1..dd9cfa22 100644 --- a/src/data.rs +++ b/src/data.rs @@ -239,7 +239,7 @@ fn load_layout_data_with_fallback( // Build the path to the right keyboard layout subdirectory //let mut variant_path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(); - let mut directory: &str = ""; + let mut variant_prefix: &str = ""; let path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR") .map(PathBuf::from) @@ -259,11 +259,11 @@ fn load_layout_data_with_fallback( // ::data::ContentPurpose::Date => env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(), // ::data::ContentPurpose::Time => env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(), // ::data::ContentPurpose::Datetime => env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap(), - ::data::ContentPurpose::Terminal => directory = "/terminal/", // terminal specific layouts - _ => directory = "", + ::data::ContentPurpose::Terminal => variant_prefix = "terminal_", // terminal specific layouts + _ => variant_prefix = "", } - let variant_name = format!("{}{}", directory, name); + let variant_name = format!("{}{}", variant_prefix, name); //variant_name.push_str(name); //let mut variant_path_buf = PathBuf::new(); -- GitLab