mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-03-06 14:00:52 -08:00
Code Issues Projects Releases Packages Wiki Activity

refactor: move service init after gotTheLock

Browse source
This commit is contained in:
tiddlygit-test 2021-03-10 00:09:43 +08:00
parent 6470c18ad8
commit b5c8a1e709
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/main.ts
View file

@ -31,31 +31,31 @@ import { IWorkspaceViewService } from './services/workspacesView/interface';
const gotTheLock = app.requestSingleInstanceLock();
bindServiceAndProxy();
const menuService = container.get<IMenuService>(serviceIdentifier.MenuService);
const nativeService = container.get<INativeService>(serviceIdentifier.NativeService);
const preferenceService = container.get<IPreferenceService>(serviceIdentifier.Preference);
const wikiService = container.get<IWikiService>(serviceIdentifier.Wiki);
const windowService = container.get<IWindowService>(serviceIdentifier.Window);
const workspaceService = container.get<IWorkspaceService>(serviceIdentifier.Workspace);
const workspaceViewService = container.get<IWorkspaceViewService>(serviceIdentifier.WorkspaceView);
logger.info('App booting');
app.on('second-instance', () => {
// Someone tried to run a second instance, we should focus our window.
const mainWindow = windowService.get(WindowNames.main);
if (mainWindow !== undefined) {
if (mainWindow.isMinimized()) {
mainWindow.restore();
}
mainWindow.focus();
}
});
if (!gotTheLock) {
logger.info('Quitting dut to we only allow one instance to run.');
console.info('Quitting dut to we only allow one instance to run.');
app.quit();
} else {
bindServiceAndProxy();
const menuService = container.get<IMenuService>(serviceIdentifier.MenuService);
const nativeService = container.get<INativeService>(serviceIdentifier.NativeService);
const preferenceService = container.get<IPreferenceService>(serviceIdentifier.Preference);
const wikiService = container.get<IWikiService>(serviceIdentifier.Wiki);
const windowService = container.get<IWindowService>(serviceIdentifier.Window);
const workspaceService = container.get<IWorkspaceService>(serviceIdentifier.Workspace);
const workspaceViewService = container.get<IWorkspaceViewService>(serviceIdentifier.WorkspaceView);
app.on('second-instance', () => {
// Someone tried to run a second instance, we should focus our window.
const mainWindow = windowService.get(WindowNames.main);
if (mainWindow !== undefined) {
if (mainWindow.isMinimized()) {
mainWindow.restore();
}
mainWindow.focus();
}
});
// make sure "Settings" file exists
// if not, ignore this chunk of code
// as using electron-settings before app.on('ready') and "Settings" is created