diff options
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | gui/src/main/index.ts | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 434fa01a6c..8821b77ca7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ Line wrap the file at 100 chars. Th - Prevent commands to connect or disconnect to be sent when the device is locked. ### Fixed +- Show both WireGuard and OpenVPN servers in location list when protocol is set to automatic on Linux and macOS. + #### Android - Fix crash when that happened sometimes when the app tried to start the daemon service on recent Android versions. 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; |