From 9752f9dc1d4570e7a68df91be44fbd056aa20707 Mon Sep 17 00:00:00 2001 From: Quang Lam Date: Sun, 10 May 2020 14:29:21 +0700 Subject: [PATCH] Fix "object has been destroyed" occurred in the main process (#238) --- public/libs/views.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/public/libs/views.js b/public/libs/views.js index f11bb17d..b43df6cb 100644 --- a/public/libs/views.js +++ b/public/libs/views.js @@ -196,8 +196,10 @@ const addView = (browserWindow, workspace) => { didFailLoad[workspace.id] = false; // show browserView again when reloading after error // see did-fail-load event - const contentSize = browserWindow.getContentSize(); - view.setBounds(getViewBounds(contentSize)); + if (browserWindow && !browserWindow.isDestroyed()) { // fix https://github.com/atomery/singlebox/issues/228 + const contentSize = browserWindow.getContentSize(); + view.setBounds(getViewBounds(contentSize)); + } } sendToAllWindows('update-did-fail-load', false); sendToAllWindows('update-is-loading', true); @@ -234,10 +236,12 @@ const addView = (browserWindow, workspace) => { if (isMainFrame && errorCode < 0 && errorCode !== -3) { if (getWorkspace(workspace.id).active) { sendToAllWindows('update-loading', false); - const contentSize = browserWindow.getContentSize(); - view.setBounds( - getViewBounds(contentSize, false, 0, 0), - ); // hide browserView to show error message + if (browserWindow && !browserWindow.isDestroyed()) { // fix https://github.com/atomery/singlebox/issues/228 + const contentSize = browserWindow.getContentSize(); + view.setBounds( + getViewBounds(contentSize, false, 0, 0), + ); // hide browserView to show error message + } sendToAllWindows('update-did-fail-load', true); } }