summaryrefslogtreecommitdiffhomepage
path: root/gui/src/shared
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-03-09 12:00:47 +0100
committerOskar Nyberg <oskar@mullvad.net>2021-03-09 12:00:47 +0100
commit2c75829950240da8e75a87c980f98135ab6fb429 (patch)
treee69d2d82184da91bac326f3522e970830ce3a7f8 /gui/src/shared
parent8a56534922588ffcb85c52eb5dad497029908839 (diff)
parent8ec56a752034458b0676cb04adda7bdb2a23a817 (diff)
downloadmullvadvpn-2c75829950240da8e75a87c980f98135ab6fb429.tar.xz
mullvadvpn-2c75829950240da8e75a87c980f98135ab6fb429.zip
Merge branch 'better-handle-non-responding-daemon'
Diffstat (limited to 'gui/src/shared')
-rw-r--r--gui/src/shared/ipc-schema.ts8
-rw-r--r--gui/src/shared/ipc-types.ts2
2 files changed, 4 insertions, 6 deletions
diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts
index 62a3afc948..3f0d86d995 100644
--- a/gui/src/shared/ipc-schema.ts
+++ b/gui/src/shared/ipc-schema.ts
@@ -107,11 +107,9 @@ export const ipcSchema = {
windowFocus: {
'': notifyRenderer<boolean>(),
},
- daemonConnected: {
- '': notifyRenderer<void>(),
- },
- daemonDisconnected: {
- '': notifyRenderer<string | undefined>(),
+ daemon: {
+ connected: notifyRenderer<void>(),
+ disconnected: notifyRenderer<void>(),
},
location: {
'': notifyRenderer<ILocation>(),
diff --git a/gui/src/shared/ipc-types.ts b/gui/src/shared/ipc-types.ts
index 7781551ed5..691d54b61b 100644
--- a/gui/src/shared/ipc-types.ts
+++ b/gui/src/shared/ipc-types.ts
@@ -1,6 +1,6 @@
export interface ICurrentAppVersionInfo {
gui: string;
- daemon: string;
+ daemon?: string;
isConsistent: boolean;
isBeta: boolean;
}