Skip to content
Merged
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/helpers/environment.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,12 @@ class EnvironmentManager {
}

loadEnvironmentVariables() {
// Loaded in priority order - dotenv won't override, so first file wins per variable.
// App config (.env in userData) takes precedence over system env vars,
// so keys saved by the user in Settings always win.
const userDataEnv = path.join(app.getPath("userData"), ".env");
try {
if (fs.existsSync(userDataEnv)) {
require("dotenv").config({ path: userDataEnv });
require("dotenv").config({ path: userDataEnv, override: true });
}
} catch {}

Expand Down
Loading