Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-08 14:25:51 +01:00
Code Issues Packages Projects Releases Activity

fix(electron): port-in-use dialog shown when opening a new window | (#7595)

Browse Source
This commit is contained in:
Elian Doran
2025-11-04 19:29:46 +02:00
committed by GitHub
parent 97e87741ee 5782e58db1
commit 421c1f257e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/server/src/www.ts
View File

@@ -158,13 +158,11 @@ function startHttpServer(app: Express) {
// Not all situations require showing an error dialog. When Trilium is already open, // Not all situations require showing an error dialog. When Trilium is already open,
// clicking the shortcut, the software icon, or the taskbar icon, or when creating a new window, // clicking the shortcut, the software icon, or the taskbar icon, or when creating a new window,
// should simply focus on the existing window or open a new one, without displaying an error message. // should simply focus on the existing window or open a new one, without displaying an error message.
if ("code" in error && error.code == "EADDRINUSE") { if ("code" in error && error.code === "EADDRINUSE" && (process.argv.includes("--new-window") || !app.requestSingleInstanceLock())) {
if (process.argv.includes("--new-window") || !app.requestSingleInstanceLock()) { console.error(message);
console.error(message); } else {
process.exit(1); dialog.showErrorBox("Error while initializing the server", message);
}
} }
dialog.showErrorBox("Error while initializing the server", message);
process.exit(1); process.exit(1);
}); });
} else { } else {