electron - properly await on exit

rjc · Feb 12, 2020 · d9796e1 · d9796e1
1 parent a66b0a9
commit d9796e1
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMainService.ts
@@ -574,12 +574,15 @@ export class LifecycleMainService extends Disposable implements ILifecycleMainSe
 			(async () => {
 				for (const window of BrowserWindow.getAllWindows()) {
 					if (window && !window.isDestroyed()) {
+						let whenWindowClosed: Promise<void>;
 						if (window.webContents && !window.webContents.isDestroyed()) {
-							await new Promise(c => window.once('closed', c));
-							window.destroy();
+							whenWindowClosed = new Promise(c => window.once('closed', c));
 						} else {
-							window.destroy();
+							whenWindowClosed = Promise.resolve();
 						}
+
+						window.destroy();
+						await whenWindowClosed;
 					}
 				}
 			})()