[Don't mount if missing dependencies] [Electron to v4]

This commit is contained in:
Scott E. Graves
2019-02-15 13:55:43 -06:00
parent d16d417c99
commit 3ab1a0f61e
2 changed files with 5 additions and 4 deletions

View File

@@ -25,7 +25,7 @@
"css-loader": "0.28.7", "css-loader": "0.28.7",
"dotenv": "4.0.0", "dotenv": "4.0.0",
"dotenv-expand": "4.2.0", "dotenv-expand": "4.2.0",
"electron-debug": "^2.0.0", "electron-debug": "^2.1.0",
"eslint": "4.10.0", "eslint": "4.10.0",
"eslint-config-react-app": "^2.1.0", "eslint-config-react-app": "^2.1.0",
"eslint-loader": "1.9.0", "eslint-loader": "1.9.0",
@@ -74,8 +74,8 @@
}, },
"devDependencies": { "devDependencies": {
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"electron": "^3.0.13", "electron": "^4.0.5",
"electron-builder": "^20.38.3", "electron-builder": "^20.38.5",
"extract-text-webpack-plugin": "^3.0.2", "extract-text-webpack-plugin": "^3.0.2",
"webpack-browser-plugin": "^1.0.20" "webpack-browser-plugin": "^1.0.20"
}, },

View File

@@ -563,8 +563,9 @@ class App extends IPCContainer {
(selectedVersion !== 'unavailable') && (selectedVersion !== 'unavailable') &&
(selectedVersion !== this.state.InstalledVersion); (selectedVersion !== this.state.InstalledVersion);
const allowMount = this.state.InstalledVersion !== 'none';
const missingDependencies = (this.state.MissingDependencies.length > 0); const missingDependencies = (this.state.MissingDependencies.length > 0);
const allowMount = this.state.InstalledVersion !== 'none' && !missingDependencies;
const allowConfig = this.state.LocationsLookup[selectedVersion] && const allowConfig = this.state.LocationsLookup[selectedVersion] &&
this.state.LocationsLookup[selectedVersion].config_support; this.state.LocationsLookup[selectedVersion].config_support;