diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-07-19 16:13:12 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-07-19 16:13:12 +0200 |
| commit | 18899e14d176c5fc8ad8296a7cc9daa88e90c854 (patch) | |
| tree | d86f7dff887cb20031575917f82ec1edef3f3004 /gui | |
| parent | 357165f1052e741c67d67cc068366b95c17854ec (diff) | |
| parent | 1eff8a02d3ee448549c69eea7edc7899da1091b9 (diff) | |
| download | mullvadvpn-18899e14d176c5fc8ad8296a7cc9daa88e90c854.tar.xz mullvadvpn-18899e14d176c5fc8ad8296a7cc9daa88e90c854.zip | |
Merge branch 'fix-reconnect-in-blocked-state'
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/src/main/index.ts | 2 | ||||
| -rw-r--r-- | gui/src/shared/connect-helper.ts | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index 07a0b711fe..0b3bb1b834 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -919,7 +919,7 @@ class ApplicationMain { // If there's a fallback state set then the app is in an assumed next state and need to check // if it's now reached or if the current state should be ignored and set as the fallback state. if (this.tunnelStateFallback) { - if (this.tunnelState.state === newState.state) { + if (this.tunnelState.state === newState.state || newState.state === 'error') { this.tunnelStateFallbackScheduler.cancel(); this.tunnelStateFallback = undefined; } else { diff --git a/gui/src/shared/connect-helper.ts b/gui/src/shared/connect-helper.ts index d5c563c7ca..26128513ed 100644 --- a/gui/src/shared/connect-helper.ts +++ b/gui/src/shared/connect-helper.ts @@ -18,7 +18,9 @@ export function reconnectEnabled( tunnelState: TunnelState['state'], ) { return ( - connectedToDaemon && loggedIn && (tunnelState === 'connected' || tunnelState === 'connecting') + connectedToDaemon && + loggedIn && + (tunnelState === 'connected' || tunnelState === 'connecting' || tunnelState === 'error') ); } |