diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-10-06 13:06:57 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-10-06 13:06:57 +0200 |
| commit | 2e5083e737c2db3286d34b2768af2eb5db6b536f (patch) | |
| tree | 1f552f6b97b40c04f0b2b64f6c41ac27fe0226c9 | |
| parent | 20a059c960f4c65e5b895d400aa34dc9775e4ca5 (diff) | |
| parent | 8527c1cbd60287910f262e414d81f5772426da2d (diff) | |
| download | mullvadvpn-2e5083e737c2db3286d34b2768af2eb5db6b536f.tar.xz mullvadvpn-2e5083e737c2db3286d34b2768af2eb5db6b536f.zip | |
Merge branch 'switch-to-connecting-state-when-reconnecting'
| -rw-r--r-- | gui/src/renderer/app.tsx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx index c37f52bd4f..c487f641ed 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -737,7 +737,12 @@ export default class AppRenderer { break; case 'disconnecting': - actions.connection.disconnecting(tunnelState.details); + if (tunnelState.details === 'reconnect') { + this.optimisticTunnelState = 'connecting'; + this.reduxActions.connection.connecting(); + } else { + actions.connection.disconnecting(tunnelState.details); + } break; case 'disconnected': @@ -750,7 +755,9 @@ export default class AppRenderer { } // Update the location when entering a new tunnel state since it's likely changed. - void this.updateLocation(); + void this.updateLocation( + this.optimisticTunnelState === undefined ? undefined : { state: this.optimisticTunnelState }, + ); } private setSettings(newSettings: ISettings) { |