From 69e32ad9ce0a79eca3bc449fa836f74b6cf83dd9 Mon Sep 17 00:00:00 2001 From: Milan Burda Date: Tue, 4 Jun 2019 18:13:35 +0200 Subject: [PATCH] refactor: use ipcRenderer.invoke / ipcMain.handle in default-app (#18581) --- default_app/default_app.ts | 8 ++------ default_app/preload.ts | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/default_app/default_app.ts b/default_app/default_app.ts index cbd10c15b1..d517aeb351 100644 --- a/default_app/default_app.ts +++ b/default_app/default_app.ts @@ -37,12 +37,8 @@ function isTrustedSender (webContents: Electron.WebContents) { return parsedUrl.protocol === 'file:' && urlPath === indexPath } -ipcMain.on('bootstrap', (event) => { - try { - event.returnValue = isTrustedSender(event.sender) ? electronPath : null - } catch { - event.returnValue = null - } +ipcMain.handle('bootstrap', (event) => { + return isTrustedSender(event.sender) ? electronPath : null }) async function createWindow () { diff --git a/default_app/preload.ts b/default_app/preload.ts index 3424ad45bb..a5546da8f9 100644 --- a/default_app/preload.ts +++ b/default_app/preload.ts @@ -1,7 +1,7 @@ import { ipcRenderer } from 'electron' -function initialize () { - const electronPath = ipcRenderer.sendSync('bootstrap') +async function initialize () { + const electronPath = await ipcRenderer.invoke('bootstrap') function replaceText (selector: string, text: string) { const element = document.querySelector(selector)