Merge pull request #1216 from exokitxr/electron-android

[Quest] Bugfix electron vm loading
exokitxr · Jun 17, 2019 · 1462531 · 1462531
2 parents 87b9b36 + 9470e8f
commit 1462531
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/electron-vm.js b/src/electron-vm.js
@@ -6,7 +6,8 @@ const child_process = require('child_process');
 const os = require('os');
 const {TextEncoder} = require('util');
 
-const electron = require('electron');
+const bindings = require('./native-bindings');
+const electron = !bindings.nativePlatform ? require('electron') : null;
 const keycode = require('keycode');
 
 const GlobalContext = require('./GlobalContext');
@@ -459,4 +460,4 @@ browser.postMessage({
     console.log('exiting...');
     cp.kill(9);
   });
-} */
+} */