diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-09-09 15:33:07 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-09-09 15:33:07 +0200 |
| commit | 930727e94ebd780c91d5475f1147b60621302eed (patch) | |
| tree | 4852b25f655e256c51dc101adb280662cbfdb986 | |
| parent | d92376b4d1df9b547930c68aa9bae9640ff2a022 (diff) | |
| parent | 241dbb4defb88bc017dd29b4758c46a1b692662b (diff) | |
| download | mullvadvpn-930727e94ebd780c91d5475f1147b60621302eed.tar.xz mullvadvpn-930727e94ebd780c91d5475f1147b60621302eed.zip | |
Merge branch 'fix-reset-renderer-optimistic-tunnel-state'
| -rw-r--r-- | gui/src/renderer/app.tsx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx index dd8a6543ca..5b75330c8b 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -731,6 +731,9 @@ export default class AppRenderer { log.debug(`Tunnel state: ${tunnelState.state}`); this.tunnelState = tunnelState; + // The main process doesn't notify the tunnel state while waiting for a new one (unless it times + // out). Therefore the first tunnel state update will be the one we're waiting for. + this.optimisticTunnelState = undefined; switch (tunnelState.state) { case 'connecting': |