From ccbbda3858bee8aecdfcb43f255d5887c820fdab Mon Sep 17 00:00:00 2001
From: David Martin <dmartin.tech@outlook.com>
Date: Mon, 26 Oct 2020 05:06:09 -0500
Subject: [PATCH] Reimplemented the funbox fix

---
 public/js/script.js     | 5 ++---
 public/js/userconfig.js | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/js/script.js b/public/js/script.js
index 9fe7af20a..f57aaf37a 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -45,7 +45,6 @@ let verifyUserWhenLoggedIn = null;
 let modeBeforePractise = null;
 let memoryFunboxTimer = null;
 let memoryFunboxInterval = null;
-let memoryFunboxKeyboardLayout = config.layout;
 
 let themeColors = {
   bg: "#323437",
@@ -330,7 +329,7 @@ function activateFunbox(funbox, mode) {
       config.keymapMode = "on";
       changeKeymapMode("next");
       settingsGroups.keymapMode.updateButton();
-      memoryFunboxKeyboardLayout = config.layout;
+      config.layoutBeforeLayoutfluid = config.layout;
       changeLayout("qwerty");
       settingsGroups.layout.updateButton();
       changeKeymapLayout("qwerty");
@@ -346,7 +345,7 @@ function activateFunbox(funbox, mode) {
 
   if (funbox !== "layoutfluid" || mode !== "script") {
     if (config.layout !== memoryFunboxKeyboardLayout) {
-      changeLayout(memoryFunboxKeyboardLayout);
+      changeLayout(config.layoutBeforeLayoutfluid);
     }
   }
   updateTestModesNotice();
diff --git a/public/js/userconfig.js b/public/js/userconfig.js
index 9035cd233..e76bb3b8a 100644
--- a/public/js/userconfig.js
+++ b/public/js/userconfig.js
@@ -37,6 +37,7 @@ let defaultConfig = {
   flipTestColors: false,
   capsLockBackspace: false,
   layout: "default",
+  layoutBeforeLayoutfluid: "default",
   confidenceMode: "off",
   indicateTypos: false,
   timerStyle: "text",
@@ -166,7 +167,7 @@ function applyConfig(configObj) {
     changeWordCount(configObj.words, true);
     changeLanguage(configObj.language, true);
     setCapsLockBackspace(configObj.capsLockBackspace, true);
-    changeLayout(configObj.layout, true);
+    changeLayout(configObj.layoutBeforeLayoutfluid, true);
     changeFontSize(configObj.fontSize, true);
     setFreedomMode(configObj.freedomMode, true);
     setCaretStyle(configObj.caretStyle, true);