From f2a2f394c73b4560a59e7fbe7e9f7760795fd3bc Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 17 Apr 2018 10:03:33 -0700 Subject: [PATCH] Unregister webview reviver on dispose Part of #48065 --- src/vs/workbench/api/electron-browser/mainThreadWebview.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts index f0ef3aef85c..b3bff528318 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadWebview.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadWebview.ts @@ -53,10 +53,11 @@ export class MainThreadWebviews implements MainThreadWebviewsShape, WebviewReviv this._proxy = context.getProxy(ExtHostContext.ExtHostWebviews); editorGroupService.onEditorsChanged(this.onEditorsChanged, this, this._toDispose); - _webviewService.registerReviver(MainThreadWebviews.viewType, this); - this._toDispose.push(lifecycleService.onWillShutdown(e => { + this._toDispose.push(_webviewService.registerReviver(MainThreadWebviews.viewType, this)); + + lifecycleService.onWillShutdown(e => { e.veto(this._onWillShutdown()); - })); + }, this, this._toDispose); } dispose(): void {