@@ -50,10 +50,10 @@ import { setUnexpectedErrorHandler, onUnexpectedError } from 'vs/base/common/err
50
50
import { ElectronURLListener } from 'vs/platform/url/electron-main/electronUrlListener' ;
51
51
import { serve as serveDriver } from 'vs/platform/driver/electron-main/driver' ;
52
52
import { IMenubarMainService , MenubarMainService } from 'vs/platform/menubar/electron-main/menubarMainService' ;
53
- import { RunOnceScheduler , timeout } from 'vs/base/common/async' ;
53
+ import { RunOnceScheduler } from 'vs/base/common/async' ;
54
54
import { registerContextMenuListener } from 'vs/base/parts/contextmenu/electron-main/contextmenu' ;
55
- import { homedir } from 'os ' ;
56
- import { join , sep , posix } from 'vs/base/common/path ' ;
55
+ import { sep , posix } from 'vs/base/common/path ' ;
56
+ import { joinPath } from 'vs/base/common/resources ' ;
57
57
import { localize } from 'vs/nls' ;
58
58
import { Schemas } from 'vs/base/common/network' ;
59
59
import { SnapUpdateService } from 'vs/platform/update/electron-main/updateService.snap' ;
@@ -269,11 +269,6 @@ export class CodeApplication extends Disposable {
269
269
try {
270
270
const shellEnv = await getShellEnvironment ( this . logService , this . environmentService ) ;
271
271
272
- // TODO@sandbox workaround for https://github.com/electron/electron/issues/25119
273
- if ( this . environmentService . sandbox ) {
274
- await timeout ( 100 ) ;
275
- }
276
-
277
272
if ( ! webContents . isDestroyed ( ) ) {
278
273
webContents . send ( 'vscode:acceptShellEnv' , shellEnv ) ;
279
274
}
@@ -494,7 +489,7 @@ export class CodeApplication extends Disposable {
494
489
495
490
recordingStopped = true ; // only once
496
491
497
- const path = await contentTracing . stopRecording ( join ( homedir ( ) , `${ product . applicationName } -${ Math . random ( ) . toString ( 16 ) . slice ( - 4 ) } .trace.txt` ) ) ;
492
+ const path = await contentTracing . stopRecording ( joinPath ( this . environmentService . userHome , `${ product . applicationName } -${ Math . random ( ) . toString ( 16 ) . slice ( - 4 ) } .trace.txt` ) . fsPath ) ;
498
493
499
494
if ( ! timeout ) {
500
495
if ( this . dialogMainService ) {
0 commit comments