Minor code review of WASM-loading code

ssdef1q1 · Dec 23, 2019 · a9bcc70 · a9bcc70
1 parent 2936d73
commit a9bcc70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/js/hntrie.js b/src/js/hntrie.js
@@ -519,12 +519,11 @@ const HNTrieContainer = class {
     }
 
     async initWASM() {
-        const module = await HNTrieContainer.enableWASM();
-        if ( module instanceof WebAssembly.Module === false ) { return false; }
-
         if ( this.wasmInstancePromise !== null ) {
-            return true;
+            return this.wasmInstancePromise;
         }
+        const module = await HNTrieContainer.enableWASM();
+        if ( module instanceof WebAssembly.Module === false ) { return false; }
         const memory = new WebAssembly.Memory({ initial: 2 });
         this.wasmInstancePromise = WebAssembly.instantiate(
             module,

diff --git a/src/js/start.js b/src/js/start.js
@@ -32,7 +32,9 @@
     ]);
     log.info(`User settings ready ${Date.now()-vAPI.T0} ms after launch`);
 
-    const shouldWASM = µm.rawSettings.disableWebAssembly !== true;
+    const shouldWASM =
+        vAPI.canWASM === true &&
+        µm.rawSettings.disableWebAssembly !== true;
     if ( shouldWASM ) {
         await Promise.all([
             µm.HNTrieContainer.enableWASM(),