diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-01-11 08:22:32 -0200 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-01-15 06:43:35 -0200 |
| commit | e5a3ab52d41f62ffe39284c20c18223e37f67d84 (patch) | |
| tree | bfa08917ef9e9bf9148d0eca120e3bff3608c506 | |
| parent | 12665167018eb697dba5d98fefb00bbfcd67430a (diff) | |
| download | mullvadvpn-e5a3ab52d41f62ffe39284c20c18223e37f67d84.tar.xz mullvadvpn-e5a3ab52d41f62ffe39284c20c18223e37f67d84.zip | |
Don't map daemon auto-connect value to GUI
| -rw-r--r-- | gui/packages/desktop/src/renderer/app.js | 1 | ||||
| -rw-r--r-- | gui/packages/desktop/src/renderer/containers/PreferencesPage.js | 2 | ||||
| -rw-r--r-- | gui/packages/desktop/src/renderer/redux/settings/reducers.js | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/gui/packages/desktop/src/renderer/app.js b/gui/packages/desktop/src/renderer/app.js index 84a7a4951c..071f4ba8dd 100644 --- a/gui/packages/desktop/src/renderer/app.js +++ b/gui/packages/desktop/src/renderer/app.js @@ -497,7 +497,6 @@ export default class AppRenderer { const reduxSettings = this._reduxActions.settings; reduxSettings.updateAllowLan(newSettings.allowLan); - reduxSettings.updateAutoConnect(newSettings.autoConnect); reduxSettings.updateEnableIpv6(newSettings.tunnelOptions.enableIpv6); reduxSettings.updateBlockWhenDisconnected(newSettings.blockWhenDisconnected); reduxSettings.updateOpenVpnMssfix(newSettings.tunnelOptions.openvpn.mssfix); diff --git a/gui/packages/desktop/src/renderer/containers/PreferencesPage.js b/gui/packages/desktop/src/renderer/containers/PreferencesPage.js index a64381aa86..fa44bb61a4 100644 --- a/gui/packages/desktop/src/renderer/containers/PreferencesPage.js +++ b/gui/packages/desktop/src/renderer/containers/PreferencesPage.js @@ -11,7 +11,7 @@ import type { ReduxState, ReduxDispatch } from '../redux/store'; import type { SharedRouteProps } from '../routes'; const mapStateToProps = (state: ReduxState) => ({ - autoConnect: state.settings.autoConnect, + autoConnect: state.settings.guiSettings.autoConnect, allowLan: state.settings.allowLan, monochromaticIcon: state.settings.guiSettings.monochromaticIcon, startMinimized: state.settings.guiSettings.startMinimized, diff --git a/gui/packages/desktop/src/renderer/redux/settings/reducers.js b/gui/packages/desktop/src/renderer/redux/settings/reducers.js index a0003608d1..7f5d1c42ef 100644 --- a/gui/packages/desktop/src/renderer/redux/settings/reducers.js +++ b/gui/packages/desktop/src/renderer/redux/settings/reducers.js @@ -48,7 +48,6 @@ export type SettingsReduxState = { guiSettings: GuiSettingsState, relaySettings: RelaySettingsRedux, relayLocations: Array<RelayLocationRedux>, - autoConnect: boolean, allowLan: boolean, enableIpv6: boolean, blockWhenDisconnected: boolean, @@ -71,7 +70,6 @@ const initialState: SettingsReduxState = { }, }, relayLocations: [], - autoConnect: false, allowLan: false, enableIpv6: true, blockWhenDisconnected: false, |