summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2022-01-04 09:33:30 +0100
committerOskar Nyberg <oskar@mullvad.net>2022-01-04 09:33:30 +0100
commite454d49f750133725a2bff0743fec7674726128a (patch)
treea5ebcaa8de6da83fa24fdfd0b8adc4be9a9170c6 /gui/src
parentbff9b282f9197057dcce7d456a04a34054428ffb (diff)
downloadmullvadvpn-e454d49f750133725a2bff0743fec7674726128a.tar.xz
mullvadvpn-e454d49f750133725a2bff0743fec7674726128a.zip
Fix entry location disabled when multihop is off
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/renderer/containers/SelectLocationPage.tsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/src/renderer/containers/SelectLocationPage.tsx b/gui/src/renderer/containers/SelectLocationPage.tsx
index 1effeac473..e6c2199820 100644
--- a/gui/src/renderer/containers/SelectLocationPage.tsx
+++ b/gui/src/renderer/containers/SelectLocationPage.tsx
@@ -30,12 +30,12 @@ const mapStateToProps = (state: IReduxState, props: IHistoryProps & IAppContext)
if (tunnelProtocol === 'openvpn' && 'normal' in state.settings.bridgeSettings) {
selectedBridgeLocation = state.settings.bridgeSettings.normal.location;
} else if ('normal' in relaySettings) {
+ multihopEnabled = relaySettings.normal.wireguard.useMultihop;
+
const entryLocation = relaySettings.normal.wireguard.entryLocation;
- if (entryLocation !== 'any') {
+ if (multihopEnabled && entryLocation !== 'any') {
selectedEntryLocation = entryLocation;
}
-
- multihopEnabled = relaySettings.normal.wireguard.useMultihop;
}
const allowEntrySelection =