From ccd61c5b20104d4c4cab2c048ee3356e43e4fe0f Mon Sep 17 00:00:00 2001
From: Miodec <bartnikjack@gmail.com>
Date: Sun, 30 Jan 2022 00:08:30 +0100
Subject: [PATCH] using optionals to avoid exceptions

---
 src/js/input-controller.js |  2 +-
 src/js/simple-popups.js    |  2 +-
 src/js/test/funbox.js      | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/js/input-controller.js b/src/js/input-controller.js
index 825ccfece..702feb239 100644
--- a/src/js/input-controller.js
+++ b/src/js/input-controller.js
@@ -123,7 +123,7 @@ function handleSpace() {
         .toString()
         .toUpperCase()
     );
-    Settings.groups.layout.updateButton();
+    Settings.groups.layout?.updateButton();
   }
   dontInsertSpace = true;
 
diff --git a/src/js/simple-popups.js b/src/js/simple-popups.js
index 9362028c5..621420d5a 100644
--- a/src/js/simple-popups.js
+++ b/src/js/simple-popups.js
@@ -561,7 +561,7 @@ list.applyCustomFont = new SimplePopup(
   "Apply",
   (fontName) => {
     if (fontName === "") return;
-    Settings.groups.fontFamily.setValue(fontName.replace(/\s/g, "_"));
+    Settings.groups.fontFamily?.setValue(fontName.replace(/\s/g, "_"));
   },
   () => {}
 );
diff --git a/src/js/test/funbox.js b/src/js/test/funbox.js
index 6a8b1fc03..a3c9fbc31 100644
--- a/src/js/test/funbox.js
+++ b/src/js/test/funbox.js
@@ -154,7 +154,7 @@ export async function activate(funbox) {
         UpdateConfig.setKeymapMode
       );
       UpdateConfig.setKeymapMode("next", true);
-      Settings.groups.keymapMode.updateButton();
+      Settings.groups.keymapMode?.updateButton();
       TestLogic.restart(undefined, true);
     }
 
@@ -181,7 +181,7 @@ export async function activate(funbox) {
       );
       UpdateConfig.setKeymapMode("off", true);
       UpdateConfig.setHighlightMode("letter", true);
-      Settings.groups.keymapMode.updateButton();
+      Settings.groups.keymapMode?.updateButton();
       TestLogic.restart(undefined, true);
     } else if (funbox === "layoutfluid") {
       rememberSetting(
@@ -190,7 +190,7 @@ export async function activate(funbox) {
         UpdateConfig.setKeymapMode
       );
       // UpdateConfig.setKeymapMode("next");
-      Settings.groups.keymapMode.updateButton();
+      Settings.groups.keymapMode?.updateButton();
       // UpdateConfig.setSavedLayout(Config.layout);
       rememberSetting("layout", Config.layout, UpdateConfig.setLayout);
       UpdateConfig.setLayout(
@@ -199,7 +199,7 @@ export async function activate(funbox) {
           : "qwerty",
         true
       );
-      Settings.groups.layout.updateButton();
+      Settings.groups.layout?.updateButton();
       rememberSetting(
         "keymapLayout",
         Config.keymapLayout,
@@ -211,7 +211,7 @@ export async function activate(funbox) {
           : "qwerty",
         true
       );
-      Settings.groups.keymapLayout.updateButton();
+      Settings.groups.keymapLayout?.updateButton();
       TestLogic.restart(undefined, true);
     } else if (funbox === "memory") {
       rememberSetting("mode", Config.mode, UpdateConfig.setMode);