gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-09 07:58:59 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
SiriusXT 2025-11-02 16:48:05 +08:00
parent 3f0b0f9b62
commit ef82c3d48b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,14 +158,13 @@ function startHttpServer(app: Express) {
// 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,
// 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 (process.argv.includes("--new-window") || !app.requestSingleInstanceLock()) {
console.error(message);
process.exit(1);
}
if ("code" in error && error.code === "EADDRINUSE" && (process.argv.includes("--new-window") || !app.requestSingleInstanceLock())) {
console.error(message);
process.exit(1);
} else {
dialog.showErrorBox("Error while initializing the server", message);
process.exit(1);
}
dialog.showErrorBox("Error while initializing the server", message);
process.exit(1);
});
} else {
console.error(message);