Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-03-11 13:23:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

make sure the user affirmatively acknowledged window deletion before deleting, fix for #1167 (#1181)

Browse Source
This commit is contained in:
Mike Sawka 2024-10-31 18:13:27 -07:00 committed by GitHub
parent e10bcee05a
commit 48001ee734
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emain/emain-viewmgr.ts
View File

@ -467,6 +467,8 @@ function createBaseWaveBrowserWindow(
}); });
if (choice === 0) { if (choice === 0) {
e.preventDefault(); e.preventDefault();
} else {
win.deleteAllowed = true;
} }
}); });
win.on("closed", () => { win.on("closed", () => {
@ -482,7 +484,7 @@ function createBaseWaveBrowserWindow(
if (numWindows == 0) { if (numWindows == 0) {
return; return;
} }
if (!win.alreadyClosed) { if (!win.alreadyClosed && win.deleteAllowed) {
console.log("win removing window from backend DB", win.waveWindowId); console.log("win removing window from backend DB", win.waveWindowId);
WindowService.CloseWindow(waveWindow.oid, true); WindowService.CloseWindow(waveWindow.oid, true);
} }

1
frontend/types/custom.d.ts vendored
View File

@ -358,6 +358,7 @@ declare global {
allTabViews: Map<string, WaveTabView>; allTabViews: Map<string, WaveTabView>;
activeTabView: WaveTabView; activeTabView: WaveTabView;
alreadyClosed: boolean; alreadyClosed: boolean;
deleteAllowed: boolean;
}; };
type WaveTabView = Electron.WebContentsView & { type WaveTabView = Electron.WebContentsView & {