diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-09-12 14:21:37 +0300 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-09-13 12:48:30 +0300 |
| commit | 4f304822baa38caa5b8f9d07b58d4183dd9f93ea (patch) | |
| tree | 9096afa3473b558426bd1409edef3d33ad9e8f55 | |
| parent | 65c51740a038a5ae8ca64578c54f06f932fef6cb (diff) | |
| download | mullvadvpn-4f304822baa38caa5b8f9d07b58d4183dd9f93ea.tar.xz mullvadvpn-4f304822baa38caa5b8f9d07b58d4183dd9f93ea.zip | |
Dismiss SelectLocation first to make sure it does not freeze for the duration of updateRelaySettings + connectTunnel
| -rw-r--r-- | gui/packages/desktop/src/renderer/containers/SelectLocationPage.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gui/packages/desktop/src/renderer/containers/SelectLocationPage.js b/gui/packages/desktop/src/renderer/containers/SelectLocationPage.js index da23a8d9ab..80f4f64b74 100644 --- a/gui/packages/desktop/src/renderer/containers/SelectLocationPage.js +++ b/gui/packages/desktop/src/renderer/containers/SelectLocationPage.js @@ -19,6 +19,9 @@ const mapDispatchToProps = (dispatch: ReduxDispatch, props: SharedRouteProps) => return { onClose: () => history.goBack(), onSelect: async (relayLocation) => { + // dismiss the view first + history.goBack(); + try { const relayUpdate = RelaySettingsBuilder.normal() .location.fromRaw(relayLocation) @@ -26,8 +29,6 @@ const mapDispatchToProps = (dispatch: ReduxDispatch, props: SharedRouteProps) => await props.app.updateRelaySettings(relayUpdate); await props.app.connectTunnel(); - - history.goBack(); } catch (e) { log.error(`Failed to select server: ${e.message}`); } |