Merge pull request #873 from 0mkara/electron_fixes

Electron fixes
7 years ago · a46e359f8a
parent d3c49f7fb5 9c98199119
commit a46e359f8a
1 changed files with 2 additions and 1 deletions
--- a/remix-solidity/src/compiler/compiler.js
+++ b/remix-solidity/src/compiler/compiler.js
@ -73,7 +73,8 @@ function Compiler (handleImportCall) {
  function onInternalCompilerLoaded () {
    if (worker === null) {
      var compiler
-      if (typeof (window) === 'undefined') {
+      var userAgent = navigator.userAgent.toLowerCase()
+      if (typeof (window) === 'undefined' || userAgent.indexOf(' electron/') > -1) {
        compiler = require('solc')
      } else {
        compiler = solc(window.Module)