summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2022-04-08 14:05:49 +0200
committerOskar Nyberg <oskar@mullvad.net>2022-04-08 14:05:49 +0200
commit72a5398a5212a0df98d6a1ca0357817abd3cc508 (patch)
tree17809eee50ead2bf0d688efe02ac8cee3b64c2e0
parentb51731cf18ca63175126128673ceaeabe6c575bd (diff)
parent6933323e8842d3699a0b5711cd9f88abd2fb3744 (diff)
downloadmullvadvpn-72a5398a5212a0df98d6a1ca0357817abd3cc508.tar.xz
mullvadvpn-72a5398a5212a0df98d6a1ca0357817abd3cc508.zip
Merge branch 'fix-entry-location-from-constraint'
-rw-r--r--gui/src/renderer/app.tsx2
1 files changed, 2 insertions, 0 deletions
diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx
index ebb7f0e18b..a0fb5f3266 100644
--- a/gui/src/renderer/app.tsx
+++ b/gui/src/renderer/app.tsx
@@ -986,8 +986,10 @@ export default class AppRenderer {
const city = country?.cities.find((location) => location.code === constraint.hostname[1]);
let entryHostname: string | undefined;
+ const multihopConstraint = relaySettings.normal.wireguardConstraints.useMultihop;
const entryLocationConstraint = relaySettings.normal.wireguardConstraints.entryLocation;
if (
+ multihopConstraint &&
entryLocationConstraint !== 'any' &&
'hostname' in entryLocationConstraint.only &&
entryLocationConstraint.only.hostname.length === 3