diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2020-10-16 11:20:41 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2020-10-16 11:20:41 +0200 |
| commit | e7f14a8bbeaa17024da71de105d2e68e7a2c444e (patch) | |
| tree | 62de940469c8d2a8a1e70b4c5f2b926f3735ab71 /gui/src/main | |
| parent | 5fe3e53756d2d5212b4f8592bae9ac33972f5126 (diff) | |
| parent | 66225b84bc9d68dc7029aed34ea3781fcbb18c58 (diff) | |
| download | mullvadvpn-e7f14a8bbeaa17024da71de105d2e68e7a2c444e.tar.xz mullvadvpn-e7f14a8bbeaa17024da71de105d2e68e7a2c444e.zip | |
Merge branch 'upgrade-to-typescript-4' into master
Diffstat (limited to 'gui/src/main')
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index 4bbca29930..006dd12866 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -940,18 +940,16 @@ function convertFromBridgeSettings( const localSettings = bridgeSettings.local; if (localSettings) { return customSettings({ - port: localSettings?.port!, - peer: localSettings?.peer!, + port: localSettings.port, + peer: localSettings.peer, }); } const remoteSettings = bridgeSettings.remote; if (remoteSettings) { return customSettings({ - address: remoteSettings?.address!, - auth: { - ...remoteSettings?.auth!, - }, + address: remoteSettings.address, + auth: remoteSettings.auth && { ...remoteSettings.auth }, }); } |