Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-21 16:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use window destroy instead of forceClose (#1400)

Browse Source 
`destroy` bypasses the `close` event and forces the window to close.
This means that we can use it instead of `forceClose` and we don't need
to call it in the `closed` event.
This commit is contained in:
Evan Simkowitz 2024-12-05 19:18:42 -05:00 committed by GitHub
parent 5fbd72b590
commit 1e804f4d15
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
emain/emain-window.ts
View File

@ -237,7 +237,13 @@ export class WaveBrowserWindow extends BaseWindow {
console.log("win removing window from backend DB", this.waveWindowId); console.log("win removing window from backend DB", this.waveWindowId);
fireAndForget(async () => await WindowService.CloseWindow(this.waveWindowId, true)); fireAndForget(async () => await WindowService.CloseWindow(this.waveWindowId, true));
} }
this.destroy(); for (const tabView of this.allTabViews.values()) {
tabView?.destroy();
}
waveWindowMap.delete(this.waveWindowId);
if (focusedWaveWindow == this) {
focusedWaveWindow = null;
}
}); });
waveWindowMap.set(waveWindow.oid, this); waveWindowMap.set(waveWindow.oid, this);
} }
@ -313,13 +319,6 @@ export class WaveBrowserWindow extends BaseWindow {
} }
} }
forceClose() {
console.log("forceClose window", this.waveWindowId);
this.canClose = true;
this.deleteAllowed = true;
this.close();
}
async setTabViewIntoWindow(tabView: WaveTabView, tabInitialized: boolean) { async setTabViewIntoWindow(tabView: WaveTabView, tabInitialized: boolean) {
const clientData = await ClientService.GetClientData(); const clientData = await ClientService.GetClientData();
if (this.activeTabView == tabView) { if (this.activeTabView == tabView) {
@ -459,13 +458,7 @@ export class WaveBrowserWindow extends BaseWindow {
destroy() { destroy() {
console.log("destroy win", this.waveWindowId); console.log("destroy win", this.waveWindowId);
for (const tabView of this.allTabViews.values()) { this.deleteAllowed = true;
tabView?.destroy();
}
waveWindowMap.delete(this.waveWindowId);
if (focusedWaveWindow == this) {
focusedWaveWindow = null;
}
super.destroy(); super.destroy();
} }
} }
@ -565,6 +558,6 @@ ipcMain.on("delete-workspace", async (event, workspaceId) => {
console.log("delete-workspace done", workspaceId, ww?.waveWindowId); console.log("delete-workspace done", workspaceId, ww?.waveWindowId);
if (ww?.workspaceId == workspaceId) { if (ww?.workspaceId == workspaceId) {
console.log("delete-workspace closing window", workspaceId, ww?.waveWindowId); console.log("delete-workspace closing window", workspaceId, ww?.waveWindowId);
ww.forceClose(); ww.destroy();
} }
}); });