From 3ab1a0f61e49d6fa8d4eec5a4a9bda1d6e7a8db6 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 15 Feb 2019 13:55:43 -0600 Subject: [PATCH] [Don't mount if missing dependencies] [Electron to v4] --- package.json | 6 +++--- src/App.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4e853c6..8f11bb0 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "css-loader": "0.28.7", "dotenv": "4.0.0", "dotenv-expand": "4.2.0", - "electron-debug": "^2.0.0", + "electron-debug": "^2.1.0", "eslint": "4.10.0", "eslint-config-react-app": "^2.1.0", "eslint-loader": "1.9.0", @@ -74,8 +74,8 @@ }, "devDependencies": { "cross-env": "^5.2.0", - "electron": "^3.0.13", - "electron-builder": "^20.38.3", + "electron": "^4.0.5", + "electron-builder": "^20.38.5", "extract-text-webpack-plugin": "^3.0.2", "webpack-browser-plugin": "^1.0.20" }, diff --git a/src/App.js b/src/App.js index bc9983a..18a30d1 100644 --- a/src/App.js +++ b/src/App.js @@ -563,8 +563,9 @@ class App extends IPCContainer { (selectedVersion !== 'unavailable') && (selectedVersion !== this.state.InstalledVersion); - const allowMount = this.state.InstalledVersion !== 'none'; const missingDependencies = (this.state.MissingDependencies.length > 0); + const allowMount = this.state.InstalledVersion !== 'none' && !missingDependencies; + const allowConfig = this.state.LocationsLookup[selectedVersion] && this.state.LocationsLookup[selectedVersion].config_support;