From addaad0dbdfd33165084818071dbd5541232c951 Mon Sep 17 00:00:00 2001
From: jahorton <jahorton@sil.org>
Date: Tue, 19 Jan 2021 09:26:16 +0700
Subject: [PATCH] fix(web): better font-wait null guards

---
 web/source/osk/visualKeyboard.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/source/osk/visualKeyboard.ts b/web/source/osk/visualKeyboard.ts
index 8aae7f13df..371aabda86 100644
--- a/web/source/osk/visualKeyboard.ts
+++ b/web/source/osk/visualKeyboard.ts
@@ -2590,14 +2590,14 @@ namespace com.keyman.osk {
       let keymanweb = com.keyman.singleton;
       let util = keymanweb.util;
 
-      if(typeof(kfd) == 'undefined' && typeof(ofd) == 'undefined') {
-        return true;
-      }
+      let fontDefined = !!(kfd && kfd['files']);
+      kfd = fontDefined ? kfd : undefined;
 
-      if(typeof(kfd['files']) == 'undefined' && typeof(ofd['files']) == 'undefined') {
-        return true;
-      }
+      let oskFontDefined = !!(ofd && ofd['files']);
+      ofd = oskFontDefined ? ofd : undefined;
 
+      // Automatically 'ready' if the descriptor is explicitly `undefined`.
+      // Thus, also covers the case where both are undefined.
       var kReady=util.checkFontDescriptor(kfd), oReady=util.checkFontDescriptor(ofd);
       if(kReady && oReady) {
         return true;