Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-04 07:15:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

move windows mutex after window open

Browse Source
This commit is contained in:
Benjamin Pasero
2017-04-05 15:08:43 +02:00
parent be24140cfc
commit 10d8dc8de9
1 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/vs/code/electron-main/app.ts
View File

@@ -96,6 +96,19 @@ export class VSCodeApplication {
}
});
app.on('will-quit', () => {
this.logService.log('App#will-quit: disposing resources');
this.dispose();
});
ipc.on('vscode:exit', (event, code: number) => {
this.logService.log('IPC#vscode:exit', code);
this.dispose();
this.lifecycleService.kill(code);
});
ipc.on(machineIdIpcChannel, (event, machineId: string) => {
this.logService.log('IPC#vscode-machineId');
this.storageService.setItem(machineIdStorageKey, machineId);
@@ -110,19 +123,6 @@ export class VSCodeApplication {
console.error('Error fetching shell env', err);
});
});
app.on('will-quit', () => {
this.logService.log('App#will-quit: disposing resources');
this.dispose();
});
ipc.on('vscode:exit', (event, code: number) => {
this.logService.log('IPC#vscode:exit', code);
this.dispose();
this.lifecycleService.kill(code);
});
}
public startup(): void {
@@ -130,18 +130,6 @@ export class VSCodeApplication {
this.logService.log(`from: ${this.environmentService.appRoot}`);
this.logService.log('args:', this.environmentService.args);
// Setup Windows mutex
let windowsMutex: Mutex = null;
if (platform.isWindows) {
try {
const Mutex = (require.__$__nodeRequire('windows-mutex') as any).Mutex;
windowsMutex = new Mutex(product.win32MutexName);
this.toDispose.push({ dispose: () => windowsMutex.release() });
} catch (e) {
// noop
}
}
// Make sure we associate the program with the app user model id
// This will help Windows to associate the running program with
// any shortcut that is pinned to the taskbar and prevent showing
@@ -167,8 +155,11 @@ export class VSCodeApplication {
// Services
const appInstantiationService = this.initServices();
// Do Startup
appInstantiationService.invokeFunction(accessor => this.doStartup(accessor));
// Open Windows
appInstantiationService.invokeFunction(accessor => this.openFirstWindow(accessor));
// Post Open Windows Tasks
appInstantiationService.invokeFunction(accessor => this.afterWindowOpen(accessor));
}
private initServices(): IInstantiationService {
@@ -198,7 +189,7 @@ export class VSCodeApplication {
return this.instantiationService.createChild(services);
}
private doStartup(accessor: ServicesAccessor): void {
private openFirstWindow(accessor: ServicesAccessor): void {
const appInstantiationService = accessor.get(IInstantiationService);
// TODO@Joao: unfold this
@@ -250,6 +241,22 @@ export class VSCodeApplication {
} else {
this.windowsMainService.open({ context, cli: args, forceNewWindow: args['new-window'] || (!args._.length && args['unity-launch']), diffMode: args.diff, initialStartup: true }); // default: read paths from cli
}
}
private afterWindowOpen(accessor: ServicesAccessor): void {
const appInstantiationService = accessor.get(IInstantiationService);
// Setup Windows mutex
let windowsMutex: Mutex = null;
if (platform.isWindows) {
try {
const Mutex = (require.__$__nodeRequire('windows-mutex') as any).Mutex;
windowsMutex = new Mutex(product.win32MutexName);
this.toDispose.push({ dispose: () => windowsMutex.release() });
} catch (e) {
// noop
}
}
// Install Menu
appInstantiationService.createInstance(VSCodeMenu);