From 92bfe6f13e56a0dd0cfeac82f90d55cc95eefe23 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Sun, 10 Apr 2022 16:19:49 +0200
Subject: fixed some more crashes

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

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

diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index ad36a15d..70267f10 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -345,8 +345,9 @@ void CConfigManager::loadConfigLoadVars() {
     for (auto& m : g_pCompositor->m_lMonitors)
         g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m.ID);
 
-    // Update the keyboard layout to the cfg'd one
-    g_pInputManager->setKeyboardLayout();
+    // Update the keyboard layout to the cfg'd one if this is not the first launch
+    if (!isFirstLaunch)
+        g_pInputManager->setKeyboardLayout();
 
     // Calculate the mod mask for main_mod
     configValues["general:main_mod_internal"].intValue = g_pKeybindManager->stringToModMask(configValues["general:main_mod"].strValue);
-- 
cgit v1.2.3