diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-01 17:26:02 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-01 17:26:02 -0300 |
| commit | d77a96468548f88c445ee27ccc5dfadbc884e74c (patch) | |
| tree | 2b14fb1f8b2da359d1e765139fbd643de8d8cb30 /gui | |
| parent | 12c090a7699dbf9971503e374ba0a826cbe8371d (diff) | |
| parent | 8c38691e32fb1788f391430b684905a268d66e2f (diff) | |
| download | mullvadvpn-d77a96468548f88c445ee27ccc5dfadbc884e74c.tar.xz mullvadvpn-d77a96468548f88c445ee27ccc5dfadbc884e74c.zip | |
Merge branch 'fix-support-for-custom-relays'
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 2 | ||||
| -rw-r--r-- | gui/src/main/index.ts | 2 | ||||
| -rw-r--r-- | gui/src/shared/daemon-rpc-types.ts | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index 2c467a0d05..91f9e8771c 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -250,7 +250,7 @@ const tunnelStateSchema = oneOf( }), ), }), - location: locationSchema, + location: maybe(locationSchema), }), }), object({ diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index 9013c7c5cd..bdc1c4f5ec 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -729,7 +729,7 @@ class ApplicationMain { if (tunnelState.state === 'connected' || tunnelState.state === 'connecting') { // Location was broadcasted with the tunnel state, but it doesn't contain the relay out IP // address, so it will have to be fetched afterwards - if (tunnelState.details) { + if (tunnelState.details && tunnelState.details.location) { this.setLocation(tunnelState.details.location); } } else if (tunnelState.state === 'disconnected') { diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts index ec52d0ad5f..5d2c77d223 100644 --- a/gui/src/shared/daemon-rpc-types.ts +++ b/gui/src/shared/daemon-rpc-types.ts @@ -77,7 +77,7 @@ export type DaemonEvent = export interface ITunnelStateRelayInfo { endpoint: ITunnelEndpoint; - location: ILocation; + location?: ILocation; } export type TunnelState = |