From aa77f8d5aaa68c1d8aa5ce71aa8414c024626e8e Mon Sep 17 00:00:00 2001
From: Oliver Blanthorn <freedom4cows@gmail.com>
Date: Thu, 24 Sep 2020 14:25:59 +0100
Subject: [PATCH] Fix #2839: parse keys iff user config loaded

---
 src/lib/config.ts | 2 +-
 src/lib/keyseq.ts | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/config.ts b/src/lib/config.ts
index 75c56f3f..f8fd5fb4 100644
--- a/src/lib/config.ts
+++ b/src/lib/config.ts
@@ -37,7 +37,7 @@ const CONFIGNAME = "userconfig"
 /** @hidden */
 const WAITERS = []
 /** @hidden */
-let INITIALISED = false
+export let INITIALISED = false
 
 /** @hidden */
 // make a naked object
diff --git a/src/lib/keyseq.ts b/src/lib/keyseq.ts
index ea1ed86a..dbc59cb1 100644
--- a/src/lib/keyseq.ts
+++ b/src/lib/keyseq.ts
@@ -418,6 +418,9 @@ export function translateKeysInPlace(keys, conf): void {
 export function keyMap(conf): KeyMap {
     if (KEYMAP_CACHE[conf]) return KEYMAP_CACHE[conf]
 
+    // Fail silently and pass keys through to page if Tridactyl hasn't loaded yet
+    if (!config.INITIALISED) return new Map()
+
     const mapobj: { [keyseq: string]: string } = config.get(conf)
     if (mapobj === undefined)
         throw new Error(