summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorTobias Järvelöv <tobias.jarvelov@mullvad.net>2025-04-08 13:46:28 +0200
committerSebastian Holmin <sebastian.holmin@mullvad.net>2025-05-28 13:25:25 +0200
commit5d4935461392e7d8fd4648ae7431d6b6bddc97e4 (patch)
tree6fb242c985aceeb0bc49d1c7e6fc55f7911800bb
parentc1162110c14d2b062fe531ec2293faa5f8f4bf3e (diff)
downloadmullvadvpn-5d4935461392e7d8fd4648ae7431d6b6bddc97e4.tar.xz
mullvadvpn-5d4935461392e7d8fd4648ae7431d6b6bddc97e4.zip
Update condition for when trying to start installer
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/app.tsx7
1 files changed, 6 insertions, 1 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/app.tsx b/desktop/packages/mullvad-vpn/src/renderer/app.tsx
index 49438f3964..c65541bc73 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/app.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/app.tsx
@@ -414,13 +414,17 @@ export default class AppRenderer {
public appUpgradeInstallerStart = () => {
const reduxState = this.reduxStore.getState();
const appUpgradeEvent = reduxState.appUpgrade.event;
+ const appUpgradeError = reduxState.appUpgrade.error;
const verifiedInstallerPath = reduxState.version.suggestedUpgrade?.verifiedInstallerPath;
// Ensure we have a the path to the verified installer and that we are not already trying
// to start the installer.
if (
typeof verifiedInstallerPath === 'string' &&
- appUpgradeEvent?.type !== 'APP_UPGRADE_STATUS_STARTING_INSTALLER'
+ verifiedInstallerPath.length > 0 &&
+ (appUpgradeEvent?.type !== 'APP_UPGRADE_STATUS_STARTING_INSTALLER' ||
+ (appUpgradeEvent?.type === 'APP_UPGRADE_STATUS_STARTING_INSTALLER' &&
+ appUpgradeError === 'START_INSTALLER_FAILED'))
) {
// Ensure we don't try to start the installer multiple times by setting the status
// as starting
@@ -652,6 +656,7 @@ export default class AppRenderer {
if (
typeof verifiedInstallerPath === 'string' &&
+ verifiedInstallerPath.length > 0 &&
appUpgradeEvent?.type === 'APP_UPGRADE_STATUS_VERIFIED_INSTALLER'
) {
// Only trigger the installer if the window is focused