diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2023-09-05 13:41:08 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2023-09-05 13:41:08 +0200 |
| commit | 0f19cb8c6dfd311ed25930107af3255c86620836 (patch) | |
| tree | e17f7072e34c154f993bace09439b399c08f601d /gui/src | |
| parent | e4be108a972b56381a51443b59312fefef1cbfbe (diff) | |
| parent | d6d208558312cbfcff028f7a3b5b926d9c0bc627 (diff) | |
| download | mullvadvpn-0f19cb8c6dfd311ed25930107af3255c86620836.tar.xz mullvadvpn-0f19cb8c6dfd311ed25930107af3255c86620836.zip | |
Merge branch 'fix-login-tests'
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/renderer/app.tsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx index 79163af67b..ccb06f33e3 100644 --- a/gui/src/renderer/app.tsx +++ b/gui/src/renderer/app.tsx @@ -910,7 +910,9 @@ export default class AppRenderer { expiry !== undefined && expiry !== previousExpiry && ((state.account.status.expiredState === undefined && expired) || - (state.account.status.expiredState === 'expired' && !expired)) + (state.account.status.expiredState === 'expired' && !expired)) && + // If the login navigation is already scheduled no navigation is needed + !this.loginScheduler.isRunning ) { const prevPath = this.history.location.pathname as RoutePath; const nextPath = expired ? RoutePath.expired : RoutePath.timeAdded; |