summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2020-03-30 11:37:17 +0200
committerOskar Nyberg <oskar@mullvad.net>2020-04-03 16:12:03 +0200
commitc6c9a7bb21b4d465518987724c6b8fe33de9fa6a (patch)
tree69d8effcfc2f30015d31faeed09bfae36eadf6e9 /gui/src
parent113901123522d9cc86bb0f2705597f5e34139503 (diff)
downloadmullvadvpn-c6c9a7bb21b4d465518987724c6b8fe33de9fa6a.tar.xz
mullvadvpn-c6c9a7bb21b4d465518987724c6b8fe33de9fa6a.zip
Update Electron to 8.2.0
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/main/index.ts4
-rw-r--r--gui/src/shared/ipc-event-channel.ts4
2 files changed, 6 insertions, 2 deletions
diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index 2dd41afbb3..0d542e475f 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -189,6 +189,10 @@ class ApplicationMain {
this.guiSettings.load();
+ // The default value has previously been false but will be changed to true in Electron 9. The
+ // false value has been deprecated in Electron 8. This can be removed when Electron 9 is used.
+ app.allowRendererProcessReuse = true;
+
app.on('activate', this.onActivate);
app.on('ready', this.onReady);
app.on('window-all-closed', () => app.quit());
diff --git a/gui/src/shared/ipc-event-channel.ts b/gui/src/shared/ipc-event-channel.ts
index 5268415bfa..48f7b71bdc 100644
--- a/gui/src/shared/ipc-event-channel.ts
+++ b/gui/src/shared/ipc-event-channel.ts
@@ -440,7 +440,7 @@ function handler<T>(event: string): (handlerFn: (value: T) => void) => void {
type RequestResult<T> = { type: 'success'; value: T } | { type: 'error'; message: string };
-// The Elector API uses the `any` type.
+// The Electron API uses the `any` type.
/* eslint-disable @typescript-eslint/no-explicit-any */
function requestHandler<T>(event: string): (fn: (...args: any[]) => Promise<T>) => void {
return (fn: (...args: any[]) => Promise<T>) => {
@@ -471,7 +471,7 @@ function requestHandler<T>(event: string): (fn: (...args: any[]) => Promise<T>)
}
/* eslint-enable @typescript-eslint/no-explicit-any */
-// The Elector API uses the `any` type.
+// The Electron API uses the `any` type.
/* eslint-disable @typescript-eslint/no-explicit-any */
function requestSender<T>(event: string): (...args: any[]) => Promise<T> {
return (...args: any[]): Promise<T> => {