diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-09-16 12:05:10 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-09-16 12:05:10 +0200 |
| commit | c5fcaaf8129325d39e5fa9a6b83984a285a03f1f (patch) | |
| tree | bfbcbd8f3bc40842fa62ac019c7517a91278ec1e /gui/src/shared | |
| parent | 4b9a2c43417d4ea5284d08dc8459589a91093536 (diff) | |
| parent | 4cea60889a5a5cd9cefc76df2afc2af612021e7e (diff) | |
| download | mullvadvpn-c5fcaaf8129325d39e5fa9a6b83984a285a03f1f.tar.xz mullvadvpn-c5fcaaf8129325d39e5fa9a6b83984a285a03f1f.zip | |
Merge branch 'update-typescript'
Diffstat (limited to 'gui/src/shared')
| -rw-r--r-- | gui/src/shared/ipc-helpers.ts | 3 | ||||
| -rw-r--r-- | gui/src/shared/logging.ts | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gui/src/shared/ipc-helpers.ts b/gui/src/shared/ipc-helpers.ts index 8c3c851a80..31469ce88a 100644 --- a/gui/src/shared/ipc-helpers.ts +++ b/gui/src/shared/ipc-helpers.ts @@ -180,7 +180,8 @@ function handle<T, R>(event: string, ipcMain: EIpcMain): Handler<T, Promise<R>> ipcMain.handle(event, async (_ipcEvent, arg: T) => { try { return { type: 'success', value: await fn(arg) }; - } catch (error) { + } catch (e) { + const error = e as Error; return { type: 'error', message: error.message || '' }; } }); diff --git a/gui/src/shared/logging.ts b/gui/src/shared/logging.ts index d87778bf13..bfde85a9da 100644 --- a/gui/src/shared/logging.ts +++ b/gui/src/shared/logging.ts @@ -56,8 +56,9 @@ export class Logger { try { await maybePromise; } catch (e) { + const error = e as Error; console.error( - `${output.constructor.name}.write: ${e.message}. Original message: ${message}`, + `${output.constructor.name}.write: ${error.message}. Original message: ${message}`, ); } } |