From 218c005f6ceb39a0fc06247d1ef5c13c9600fc62 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Wed, 9 Nov 2016 09:14:24 +0100 Subject: [PATCH] missing merge changes --- src/vs/code/electron-main/lifecycle.ts | 2 +- .../lifecycle/electron-browser/lifecycleService.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vs/code/electron-main/lifecycle.ts b/src/vs/code/electron-main/lifecycle.ts index 0768b811fcf..fdc8b5b1726 100644 --- a/src/vs/code/electron-main/lifecycle.ts +++ b/src/vs/code/electron-main/lifecycle.ts @@ -187,7 +187,7 @@ export class LifecycleService implements ILifecycleService { c(true); // veto }); - vscodeWindow.send('vscode:beforeUnload', { okChannelReply: oneTimeOkEvent, cancelChannelReply: oneTimeCancelEvent, quitRequested: this.quitRequested }); + vscodeWindow.send('vscode:beforeUnload', { okChannel: oneTimeOkEvent, cancelChannel: oneTimeCancelEvent, quitRequested: this.quitRequested }); }); } diff --git a/src/vs/workbench/services/lifecycle/electron-browser/lifecycleService.ts b/src/vs/workbench/services/lifecycle/electron-browser/lifecycleService.ts index 1e613f2cc73..12f4ff4639e 100644 --- a/src/vs/workbench/services/lifecycle/electron-browser/lifecycleService.ts +++ b/src/vs/workbench/services/lifecycle/electron-browser/lifecycleService.ts @@ -50,19 +50,19 @@ export class LifecycleService implements ILifecycleService { const windowId = this.windowService.getWindowId(); // Main side indicates that window is about to unload, check for vetos - ipc.on('vscode:beforeUnload', (event, args: { okChannelReply: string, cancelChannelReply: string, quitRequested: boolean }) => { + ipc.on('vscode:beforeUnload', (event, reply: { okChannel: string, cancelChannel: string, quitRequested: boolean }) => { this._willShutdown = true; - this._quitRequested = args.quitRequested; + this._quitRequested = reply.quitRequested; // trigger onWillShutdown events and veto collecting - this.onBeforeUnload(args.quitRequested).done(veto => { + this.onBeforeUnload(reply.quitRequested).done(veto => { this._quitRequested = false; if (veto) { this._willShutdown = false; // reset this flag since the shutdown has been vetoed! - ipc.send(args.cancelChannelReply, windowId); + ipc.send(reply.cancelChannel, windowId); } else { this._onShutdown.fire(); - ipc.send(args.okChannelReply, windowId); + ipc.send(reply.okChannel, windowId); } }); }); -- GitLab