@@ -50,10 +50,10 @@ import { setUnexpectedErrorHandler, onUnexpectedError } from 'vs/base/common/err
5050import { ElectronURLListener } from 'vs/platform/url/electron-main/electronUrlListener' ;
5151import { serve as serveDriver } from 'vs/platform/driver/electron-main/driver' ;
5252import { 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' ;
5454import { 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 ' ;
5757import { localize } from 'vs/nls' ;
5858import { Schemas } from 'vs/base/common/network' ;
5959import { SnapUpdateService } from 'vs/platform/update/electron-main/updateService.snap' ;
@@ -269,11 +269,6 @@ export class CodeApplication extends Disposable {
269269 try {
270270 const shellEnv = await getShellEnvironment ( this . logService , this . environmentService ) ;
271271
272- // TODO@sandbox workaround for https://github.com/electron/electron/issues/25119
273- if ( this . environmentService . sandbox ) {
274- await timeout ( 100 ) ;
275- }
276-
277272 if ( ! webContents . isDestroyed ( ) ) {
278273 webContents . send ( 'vscode:acceptShellEnv' , shellEnv ) ;
279274 }
@@ -494,7 +489,7 @@ export class CodeApplication extends Disposable {
494489
495490 recordingStopped = true ; // only once
496491
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 ) ;
498493
499494 if ( ! timeout ) {
500495 if ( this . dialogMainService ) {
0 commit comments