From 8f7933c111d1c5ad613182f8f1fe3d6d2d795a60 Mon Sep 17 00:00:00 2001 From: JellyBrick Date: Tue, 28 Nov 2023 11:29:43 +0900 Subject: [PATCH] fix: fix `restartNeeded` --- src/index.ts | 8 ++++---- src/loader/preload.ts | 2 +- src/loader/renderer.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/index.ts b/src/index.ts index 7a9c582a..77b57a69 100644 --- a/src/index.ts +++ b/src/index.ts @@ -157,7 +157,7 @@ const initHook = (win: BrowserWindow) => { forceUnloadMainPlugin(id, win); } - if (mainPlugins[id]?.restartNeeded) { + if (allPlugins[id]?.restartNeeded) { showNeedToRestartDialog(id); } } @@ -176,14 +176,14 @@ const initHook = (win: BrowserWindow) => { }; const showNeedToRestartDialog = (id: string) => { - const plugin = mainPlugins[id]; + const plugin = allPlugins[id]; const dialogOptions: Electron.MessageBoxOptions = { type: 'info', buttons: ['Restart Now', 'Later'], title: 'Restart Required', - message: `"${plugin.name ?? id}" needs to restart`, - detail: `"${plugin.name ?? id}" plugin requires a restart to take effect`, + message: `"${plugin?.name ?? id}" needs to restart`, + detail: `"${plugin?.name ?? id}" plugin requires a restart to take effect`, defaultId: 0, cancelId: 1, }; diff --git a/src/loader/preload.ts b/src/loader/preload.ts index e45a1415..1f2e4cb9 100644 --- a/src/loader/preload.ts +++ b/src/loader/preload.ts @@ -29,7 +29,7 @@ export const forceUnloadPreloadPlugin = (id: string) => { hasStopped || ( hasStopped === null && - typeof loadedPluginMap[id].preload !== 'function' && loadedPluginMap[id].preload + loadedPluginMap[id].preload ) ) { console.log(LoggerPrefix, `"${id}" plugin is unloaded`); diff --git a/src/loader/renderer.ts b/src/loader/renderer.ts index 763bc491..16442593 100644 --- a/src/loader/renderer.ts +++ b/src/loader/renderer.ts @@ -48,7 +48,7 @@ export const forceUnloadRendererPlugin = (id: string) => { hasStopped || ( hasStopped === null && - typeof plugin?.renderer !== 'function' && plugin?.renderer + plugin?.renderer ) ) { console.log(LoggerPrefix, `"${id}" plugin is unloaded`);