Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-02-27 13:16:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ben/folder-id

Browse Source
This commit is contained in:
Benjamin Pasero
2021-01-22 11:27:03 +01:00
committed by GitHub
parent ec337988dd f9d16c3b3c
commit 05bf7b0afc
83 changed files with 4210 additions and 3511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/code/electron-main/sharedProcess.ts
View File

@@ -73,7 +73,7 @@ export class SharedProcess extends Disposable implements ISharedProcess {
}
// Signal exit to shared process when shutting down
if (!window.webContents.isDestroyed()) {
if (!window.isDestroyed() && !window.webContents.isDestroyed()) {
window.webContents.send('vscode:electron-main->shared-process=exit');
}

4
src/vs/code/electron-main/window.ts
View File

@@ -422,7 +422,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
this.dispose();
});
const svgFileSchemes = new Set([Schemas.file, Schemas.vscodeFileResource, 'devtools']);
const svgFileSchemes = new Set([Schemas.file, Schemas.vscodeFileResource, Schemas.vscodeRemoteResource, 'devtools']);
this._win.webContents.session.webRequest.onBeforeRequest((details, callback) => {
// Prevent loading of remote svgs
if (details.url.endsWith('.svg')) {
@@ -1265,7 +1265,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
send(channel: string, ...args: any[]): void {
if (this._win) {
if (this._win.webContents.isDestroyed()) {
if (this._win.isDestroyed() || this._win.webContents.isDestroyed()) {
this.logService.warn(`Sending IPC message to channel ${channel} for window that is destroyed`);
return;
}

2
src/vs/code/node/cliProcessMain.ts
View File

@@ -47,7 +47,7 @@ import { ILocalizationsService } from 'vs/platform/localizations/common/localiza
import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
import { toErrorMessage } from 'vs/base/common/errorMessage';
export class CliMain extends Disposable {
class CliMain extends Disposable {
constructor(
private argv: NativeParsedArgs