summaryrefslogtreecommitdiffhomepage
path: root/gui
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-05-27 16:34:30 +0200
committerOskar Nyberg <oskar@mullvad.net>2020-05-27 16:55:26 +0200
commit0cd528af46c8511bd057f5917bcffd42b9b1300d (patch)
tree10ee6e954048f0b13d556d6fb8558a8051973e79 /gui
parent4a416c935150bbac54dc8ca4bb9d90cb16182e63 (diff)
downloadmullvadvpn-0cd528af46c8511bd057f5917bcffd42b9b1300d.tar.xz
mullvadvpn-0cd528af46c8511bd057f5917bcffd42b9b1300d.zip
Show WireGuard servers on Linux and macOS when automatic protocol
Diffstat (limited to 'gui')
-rw-r--r--gui/src/main/index.ts10
1 files changed, 6 insertions, 4 deletions
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index b2d33a700e..e905159bfb 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -691,10 +691,12 @@ class ApplicationMain {
return relay.tunnels.wireguard.length > 0;
case 'any':
- // TODO: once wireguard is stable, by default we should only filter by
- // hasToHaveOpenvpn || hasToHaveWg, until then, only filter wireguard
- // relays if tunnel constraints specify wireguard tunnels.
- return relay.tunnels.openvpn.length > 0;
+ // TODO: Drop win32 check when Wireguard becomes default on Windows
+ if (process.platform === 'win32') {
+ return relay.tunnels.openvpn.length > 0;
+ } else {
+ return relay.tunnels.openvpn.length > 0 || relay.tunnels.wireguard.length > 0;
+ }
default:
return false;