Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 4, 2025
Merged

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

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef82c3d
fix(electron): port-in-use dialog shown when opening a new window |
SiriusXT Nov 2, 2025
f3f07cd
fix(electron): port-in-use dialog shown when opening a new window
SiriusXT Nov 2, 2025
6f0a264
Merge branch 'main' into electron_newwindow
SiriusXT Nov 2, 2025
5782e58
Merge branch 'main' into electron_newwindow
SiriusXT Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions apps/server/src/www.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())) {
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Nov 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The condition for this if statement is quite long and combines multiple checks. To improve readability and make the code more self-documenting, you could extract this logic into a helper function. For example, a function named isSecondInstanceLaunch would make the intent of this conditional block immediately clear.

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);
Expand Down