mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-01-07 17:53:38 -08:00
Code Issues Projects Releases Packages Wiki Activity

Fix "object has been destroyed" occurred in the main process (#238)

Browse source
This commit is contained in:
Quang Lam 2020-05-10 14:29:21 +07:00 • committed by GitHub
parent bdbab640f5
commit 9752f9dc1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
public/libs/views.js
View file

@ -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);
}
}