summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorTobias Järvelöv <tobias.jarvelov@mullvad.net>2025-02-21 15:38:44 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-02-28 10:45:00 +0100
commitd4667f94b7e16a9d00afcc55c2f6ef5d9b7c802b (patch)
tree3e252a23db4bebcdfd4bbbaadf6660109571767c
parent4edeccf444519b25a7f6928d9daaaf3b7dbd491b (diff)
downloadmullvadvpn-d4667f94b7e16a9d00afcc55c2f6ef5d9b7c802b.tar.xz
mullvadvpn-d4667f94b7e16a9d00afcc55c2f6ef5d9b7c802b.zip
Ensure a city is disabled if all its relays are disabled
This situation can happen when multihop is enabled and when a city only has a single relay which has already been used as Entry and the user is viewing the Exit view, or vice versa.
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/select-location/select-location-helpers.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/select-location/select-location-helpers.ts b/desktop/packages/mullvad-vpn/src/renderer/components/select-location/select-location-helpers.ts
index 3d099adb7b..0d0931f552 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/select-location/select-location-helpers.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/select-location/select-location-helpers.ts
@@ -128,7 +128,7 @@ export function isCityDisabled(
disabledLocation?: { location: RelayLocation; reason: DisabledReason },
): DisabledReason | undefined {
const relaysDisabled = city.relays.map((relay) =>
- isRelayDisabled(relay, { ...location, hostname: relay.hostname }),
+ isRelayDisabled(relay, { ...location, hostname: relay.hostname }, disabledLocation),
);
if (relaysDisabled.every((status) => status === DisabledReason.inactive)) {
return DisabledReason.inactive;