File tree 1 file changed +14
-1
lines changed
1 file changed +14
-1
lines changed Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ index a43d63aa51..4c6df2fcd9 100644
53
53
+++ b/src/vs/workbench/electron-browser/main.ts
54
54
@@ -147,13 +147,14 @@ function openWorkbench(configuration: IWindowConfiguration): Promise<void> {
55
55
shell.open();
56
-
56
+
57
57
// Inform user about loading issues from the loader
58
58
- (<any>self).require.config({
59
59
- onError: err => {
@@ -73,6 +73,19 @@ index a43d63aa51..4c6df2fcd9 100644
73
73
});
74
74
});
75
75
});
76
+ diff --git a/src/vs/workbench/node/extensionHostProcess.ts b/src/vs/workbench/node/extensionHostProcess.ts
77
+ index 8d182d18d9..69d51e1aea 100644
78
+ --- a/src/vs/workbench/node/extensionHostProcess.ts
79
+ +++ b/src/vs/workbench/node/extensionHostProcess.ts
80
+ @@ -129,7 +129,7 @@ function connectToRenderer(protocol: IMessagePassingProtocol): Promise<IRenderer
81
+ // Kill oneself if one's parent dies. Much drama.
82
+ setInterval(function () {
83
+ try {
84
+ - process.kill(initData.parentPid, 0); // throws an exception if the main process doesn't exist anymore.
85
+ + // process.kill(initData.parentPid, 0); // throws an exception if the main process doesn't exist anymore.
86
+ } catch (e) {
87
+ onTerminate();
88
+ }
76
89
diff --git a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts b/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts
77
90
index 7b4e8721ac..8f26dc2f28 100644
78
91
--- a/src/vs/workbench/parts/welcome/walkThrough/node/walkThroughContentProvider.ts
You can’t perform that action at this time.
0 commit comments