mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-01-27 06:50:48 -08:00
Code Issues Projects Releases Packages Wiki Activity

fix: prevent crush when destroy browser view

Browse source
This commit is contained in:
林一二 2021-12-12 21:21:42 +08:00
parent 8fc533d767
commit 09c5244aed
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/services/view/index.ts
View file

@ -381,12 +381,15 @@ export class View implements IViewService {
public removeView = (workspaceID: string, windowName: WindowNames): void => {
const view = this.getView(workspaceID, windowName);
void session.fromPartition(`persist:${workspaceID}`).clearStorageData();
if (view !== undefined) {
const browserWindow = this.windowService.get(windowName);
if (view !== undefined && browserWindow !== undefined) {
void session.fromPartition(`persist:${workspaceID}`).clearStorageData();
// stop find in page when switching workspaces
view.webContents.stopFindInPage('clearSelection');
view.webContents.send(WindowChannel.closeFindInPage);
// currently use workaround https://github.com/electron/electron/issues/10096
// eslint-disable-next-line unicorn/no-null
browserWindow.setBrowserView(null);
// @ts-expect-error Property 'destroy' does not exist on type 'WebContents'.ts(2339)
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
view.webContents.destroy();