diff --git a/public/electron.js b/public/electron.js index 001b254..87cdd53 100644 --- a/public/electron.js +++ b/public/electron.js @@ -293,9 +293,10 @@ ipcMain.on(Constants.IPC_Check_Daemon_Version, (event, data) => { .then(code => { standardIPCReply(event, Constants.IPC_Check_Daemon_Version_Reply, { Valid: (code === 0), + Code: code, }); }) - .catch(e=> { + .catch(e => { standardIPCReply(event, Constants.IPC_Check_Daemon_Version_Reply, { Valid: false, }, e); diff --git a/src/containers/Configuration/Configuration.js b/src/containers/Configuration/Configuration.js index 156f70c..1bca79b 100644 --- a/src/containers/Configuration/Configuration.js +++ b/src/containers/Configuration/Configuration.js @@ -6,7 +6,7 @@ import Button from '../../components/UI/Button/Button'; import ConfigurationItem from '../../components/ConfigurationItem/ConfigurationItem'; import Modal from '../../components/UI/Modal/Modal'; import IPCContainer from '../IPCContainer/IPCContainer'; -import {displayConfiguration} from "../../redux/actions/mount_actions"; +import {displayConfiguration} from '../../redux/actions/mount_actions'; const Constants = require('../../constants'); diff --git a/src/containers/MountItems/MountItems.js b/src/containers/MountItems/MountItems.js index 5a5b628..f7ad092 100644 --- a/src/containers/MountItems/MountItems.js +++ b/src/containers/MountItems/MountItems.js @@ -125,7 +125,13 @@ class MountItems extends IPCContainer { } } else { allowAction = false; - this.props.errorHandler("Incompatible " + provider + " daemon. Please upgrade " + provider); + if (result.Code === -1) { + this.props.errorHandler('Failed to connect to ' + provider + ' daemon'); + } else if (result.Code === -3) { + this.props.errorHandler('Incompatible ' + provider + ' daemon. Please upgrade ' + provider); + } else { + this.props.errorHandler('Version check failed: ' + result.Error); + } } } else { allowAction = false;