Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-02 19:36:12 +01:00
Code Issues Packages Projects Releases Activity

focus existing window on port conflict, closes #3036

Browse Source
This commit is contained in:
zadam
2022-08-02 22:53:06 +02:00
parent 563808144e
commit f161488c13
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/services/window.js
View File

@@ -44,7 +44,7 @@ ipcMain.on('create-extra-window', (event, arg) => {
createExtraWindow(arg.notePath, arg.hoistedNoteId);
});
async function createMainWindow() {
async function createMainWindow(app) {
const windowStateKeeper = require('electron-window-state'); // should not be statically imported
const mainWindowState = windowStateKeeper({
@@ -81,6 +81,18 @@ async function createMainWindow() {
mainWindow.on('closed', () => mainWindow = null);
configureWebContents(mainWindow.webContents, spellcheckEnabled);
app.on('second-instance', () => {
// Someone tried to run a second instance, we should focus our window.
// see www.js "requestSingleInstanceLock" for the rest of this logic with explanation
if (mainWindow) {
if (mainWindow.isMinimized()) {
mainWindow.restore();
}
mainWindow.focus();
}
});
}
function configureWebContents(webContents, spellcheckEnabled) {