From 1f205d6ad0f64323245f0135c189e4283ee3fb80 Mon Sep 17 00:00:00 2001
From: M33 <327-m33@git.qoto.org>
Date: Tue, 16 Mar 2021 21:28:16 +0000
Subject: [PATCH] Update src/data.rs

---
 src/data.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/data.rs b/src/data.rs
index 2f962547..6850d471 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -237,18 +237,18 @@ fn load_layout_data_with_fallback(
 ) -> (ArrangementKind, ::layout::LayoutData) {
 
     // Build the path to the right keyboard layout subdirectory
-    let mut path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR")
-        .map(PathBuf::from)
-        .or_else(|| xdg::data_path("squeekboard/keyboards"));
+    let mut variant_path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR").unwrap();   
+
+    //let mut path = env::var_os("SQUEEKBOARD_KEYBOARDSDIR")
+    //    .map(PathBuf::from)
+    //    .or_else(|| xdg::data_path("squeekboard/keyboards"));
     
-    //let mut variant_path = PathBuf::new();
-    //variant_path.push(path);
     match variant {
-        ::data::ContentPurpose::Terminal => path.join("/terminal"), // terminal specific layouts
+        ::data::ContentPurpose::Terminal => variant_path.push("/terminal"), // terminal specific layouts
     }
     
     //let full_path=PathBuf::from(variant_path);serde::export::Some(full_path)
-    for (kind, source) in list_layout_sources(name, kind, path) {
+    for (kind, source) in list_layout_sources(name, kind, variant_path.map(PathBuf::from)) {
         let layout = load_layout_data(source.clone());
         match layout {
             Err(e) => match (e, source) {
-- 
GitLab