From b67eae722857f6f9e69f99e46dc8b6c83dad6a1c Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Fri, 6 May 2022 14:30:35 +0200
Subject: fix kb stuff

---
 src/config/ConfigManager.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/config/ConfigManager.cpp')

diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index e4714b74..ad8da9ae 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -58,10 +58,10 @@ void CConfigManager::setDefaultVars() {
     configValues["animations:fadein"].intValue = 1;
 
     configValues["input:kb_layout"].strValue = "en";
-    configValues["input:kb_variant"].strValue = "";
-    configValues["input:kb_options"].strValue = "";
-    configValues["input:kb_rules"].strValue = "";
-    configValues["input:kb_model"].strValue = "";
+    configValues["input:kb_variant"].strValue = STRVAL_EMPTY;
+    configValues["input:kb_options"].strValue = STRVAL_EMPTY;
+    configValues["input:kb_rules"].strValue = STRVAL_EMPTY;
+    configValues["input:kb_model"].strValue = STRVAL_EMPTY;
     configValues["input:repeat_rate"].intValue = 25;
     configValues["input:repeat_delay"].intValue = 600;
     configValues["input:touchpad:disable_while_typing"].intValue = 1;
@@ -579,7 +579,12 @@ float CConfigManager::getFloat(std::string v) {
 }
 
 std::string CConfigManager::getString(std::string v) {
-    return getConfigValueSafe(v).strValue;
+    const auto VAL = getConfigValueSafe(v).strValue;
+
+    if (VAL == STRVAL_EMPTY)
+        return "";
+
+    return VAL;
 }
 
 void CConfigManager::setInt(std::string v, int val) {
-- 
cgit v1.2.3