diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-06-19 13:59:14 +0200 |
|---|---|---|
| committer | Oskar <oskar@mullvad.net> | 2025-06-30 11:44:28 +0200 |
| commit | cd890fb36190d373e3b16ae63ec0bc0c3bbb1e43 (patch) | |
| tree | 4ad114a1989adeeec2252d6497c54fcbb3812699 | |
| parent | 7a97c79d301a4d8601eb758ebd7e79718e553dcd (diff) | |
| download | mullvadvpn-cd890fb36190d373e3b16ae63ec0bc0c3bbb1e43.tar.xz mullvadvpn-cd890fb36190d373e3b16ae63ec0bc0c3bbb1e43.zip | |
Disable RestartDaemonFooter button if status is not stopped
3 files changed, 4 insertions, 3 deletions
diff --git a/desktop/packages/mullvad-vpn/src/main/user-interface.ts b/desktop/packages/mullvad-vpn/src/main/user-interface.ts index ee653cdc7a..06adb285ad 100644 --- a/desktop/packages/mullvad-vpn/src/main/user-interface.ts +++ b/desktop/packages/mullvad-vpn/src/main/user-interface.ts @@ -64,6 +64,8 @@ export default class UserInterface implements WindowControllerDelegate { public registerIpcListeners() { IpcMainEventChannel.daemon.handleTryStart(() => { + IpcMainEventChannel.daemon.notifyTryStartEvent?.('start-requested'); + try { const SETUP_PATH = `"${resolveBin('mullvad-setup')}"`; @@ -85,6 +87,7 @@ export default class UserInterface implements WindowControllerDelegate { IpcMainEventChannel.daemon.notifyTryStartEvent?.('stopped'); } else { log.info('"mullvad-setup.exe start-service" succeeded'); + // 'running' is set from onDaemonConnected event handler } }); } catch (e) { diff --git a/desktop/packages/mullvad-vpn/src/renderer/app.tsx b/desktop/packages/mullvad-vpn/src/renderer/app.tsx index 4658fe8b61..e705f76661 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/app.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/app.tsx @@ -447,9 +447,7 @@ export default class AppRenderer { }; public tryStartDaemon = () => { - this.reduxActions.userInterface.setDaemonStatus('start-requested'); if (window.env.platform === 'win32') IpcRendererEventChannel.daemon.tryStart(); - else this.reduxActions.userInterface.setDaemonStatus('stopped'); }; public appUpgrade = () => { diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/launch/components/footer/components/restart-daemon-footer/RestartDaemonFooter.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/launch/components/footer/components/restart-daemon-footer/RestartDaemonFooter.tsx index acee94e448..88647c26dd 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/launch/components/footer/components/restart-daemon-footer/RestartDaemonFooter.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/launch/components/footer/components/restart-daemon-footer/RestartDaemonFooter.tsx @@ -20,7 +20,7 @@ export function RestartDaemonFooter() { return ( <> <FlexColumn $gap="medium"> - <Button onClick={handleTryAgain} disabled={daemonStatus === 'start-requested'}> + <Button onClick={handleTryAgain} disabled={daemonStatus && daemonStatus !== 'stopped'}> <Button.Text> { // TRANSLATORS: Button label for trying to restart the daemon again. |